Merge "Sysconfig: Allow runtime differentiation of product configuration" into main am: c30aeaf4 am: 3fc810ee

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2437552



Change-Id: I2c0d250dea6be413a818486c243f60cfefa8df41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2437552



Change-Id: I5a9c5727dcd85278bd0df0c30668c530af5e4e6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3050289



Change-Id: If4b77ce04e6a8ab8bd02e20d76bb0cbde4107815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3050289



Change-Id: I1cc53e212c14de215b8f212375fbd3f6239d109f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

This reverts commit 855a8539.

Reason for revert: Potential culprit for 335917937 - will rung abtd before submission. 

Change-Id: I04a13838257005438c1eb79727f1a651b64705f4

SQL strings are scanned to find the (first) SQL command and to
characterize the statement.  This change replaces a regular expression
parser with a hand-crafted parser.

Custom unit tests indicate that the new parser is 10x faster than the
regex implementation.  Native memory allocation done by the Java
Matcher class is eliminated.

Additional unit tests have been added to test the scanner.

Test : atest
 * FrameworksCoreTests:android.database

Flag: android.database.sqlite.simple_sql_comment_scanner
Bug: 329118560

Change-Id: I3124dd7f57147607a07b42cfa711e54a81348b10

To hide/show the app handle whenever the app requests immersive mode
while the app is in fullscreen.

Bug: 336368019
Test: m
Change-Id: I165685b40ffbc7651166655c51f976f4bf7e5209

am skip reason: Merged-In I920b1b37be24fe77ed17e160e85ccea5ac82ebca with SHA-1 32a65e8d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27057804



Change-Id: I400dc576344c04a978b24c5d63b65b39bc36b353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Check if the device is provisioned before showing the satellite icon am: 9ffc1189 -s ours

am skip reason: Merged-In I2ba8422871042390e257704f4ac7671a8f6f89e3 with SHA-1 5bc50b6c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27056865



Change-Id: I5193086089811d2936923c8ffd097bb75866f155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 242aaea4 -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27047762



Change-Id: I3da40988986a1d6cddaccf4c94fdc6728b95689f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27047762



Change-Id: Idd5dda1a5607868ad5d8fcfdae828e9c68ff1e4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3049902



Change-Id: I3f82c7c79b9aa966c05dc616b3b6d555e27e67af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3049902



Change-Id: Id54230ae2c50a70eb6cc46f5eb1098c8d3fb2da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

It's not clear when lockscreen shortcuts stopped being visible in
Flexiglass but this CL fixes that problem.

The root cause is that KeyguardQuickAffordanceInteractor uses
isKeyguardShowing from KeyguardInteractor and that feeds on state that's
not being kept up-to-date when Flexiglass is on.

Fix: 335679293
Test: manually verified that the lockscreen shortcuts are visible and
can be long-pressed properly
Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT

Change-Id: I9106fcb1bebed2302db5646f4643c4f255eed88f