Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev

Merge "Pleasant sound implemented for in-call notif." into oc-mr1-dev

Merge "Add dirty_image_objects file." into oc-mr1-dev

Merge "Group new free notis if autogroup summary exists" into oc-mr1-dev

Merge "Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS" into oc-mr1-dev

Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3  -s ours
am: b6ba151a6f  -s ours

Change-Id: Ie26efb399e409d4ca90b434f9dbe6ee648d08c36

Merge "Enforce policy for camera gesture in keyguard" into oc-dev
am: 49bef543b3  -s ours

Change-Id: I69369945e8fc5c1090c8ee217b5d193f5fb1236d

Merge "Enforce policy for camera gesture in keyguard" into oc-dev

Merge "FRP: clear FRP when setup complete if not set up" into oc-mr1-dev

Merge "Fix the strings accordingly for policy transparency dialogs" into oc-mr1-dev

Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS

This fixes the bug where different dialogs can appear
over the ambient screen or the Recent Apps screen.

Bug: 63286397
Test: manual, runtest systemui
Change-Id: I86d0cdd3d30e0ea8cbdae2dc220e1f988cf6decb
(cherry picked from commit 679dc2492ce1286a44c9dcd60e18dc97dd886a0a)

Merge "Remove preloaded media route resources" into oc-mr1-dev

Merge "Removed isUserStoppingOrShuttingDownLocked" into oc-mr1-dev

Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev
am: cad75e2437

Change-Id: Ib609a68d8da9eab5e4993565c61aec9ea6b1ba35

Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev

Merge "FP permission checks should not crash system process" into oc-mr1-dev

Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev

Remove preloaded media route resources

Remove system preloads previously removed in ag/2549555 and mistakenly
readded in merge ag/2691682.

Bug: 64567067
Bug: 64534957
Change-Id: I707ebf9f998aaeb472e41ebde2802db3d3f20a4d
Test: build

Merge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev

Add dirty_image_objects file.

Allows grouping of classes with dirty static fields to be grouped
together in the image to have fewer dirty pages.

Bug: 62554875
Test: mm test-art-host

(cherry picked from commit 37641ae54ab72509276d0fdd3f0fabeea9988c4a)

Change-Id: Ibc30b13edb9554f79df86e98253ae318a5ece342

Merge "Stop focusing views before layout." into oc-dr1-dev
am: a5dab05b61

Change-Id: I31f4ce541ac56887549a654b5e313e1f361152c3

DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs.

Bug: 62240247
Test: cts-tradefed run singleCommand cts-dev -m CtsIncidentHostTestCases -t \
      com.android.server.cts.BatteryStatsValidationTest

Change-Id: I1328fe7bf29229e9563cde6eea80addf2b91ea5d

Merge "Stop focusing views before layout." into oc-dr1-dev

Merge "Delete all ro.hwui.* props" into oc-mr1-dev

Pleasant sound implemented for in-call notif.

Replacing tone generator with an audio file for in-call notifications from text messages.

Fixes: 38194285
Test: runtest -x frameworks/base/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java
Change-Id: I9ec28ff54ae259ae906b3db08ece7059707c7edb

Group new free notis if autogroup summary exists

In the case where an app posted enough notifications to
get an autogrpup summary, but then canceled most of them,
add all new group-less notifications to the autogroup summary
even if the total number of notifications currently posted
by the app is < the autogroup trigger number

Test: runtest systemui-notification, cts
Change-Id: I6f7a8a0140abcff2b0f78eacfbf23cfab12897fa
Fixes: 64158706

Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission

Test: make -j56 cts
run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>

Fixes: 64560640

Change-Id: Ic807028567da9a4f3f108121d3e36358a513cf04

Merge "SharedMemory API changes" into oc-mr1-dev

Stop focusing views before layout.

Rolls back one line of ag/2257919.

Bug: 63811145
Test: TalkBack no longer reads the page backwards in:
Settings > System > Reset > Factory data reset
Settings > Connected devices > Android Beam

Change-Id: I6b04e64cd650ebda193da4a54bf0721bd256820c

Merge "Added focus behavior changes to Build.VERSION documentation." into oc-mr1-dev

Merge "CharSequenceTransformation should not change anything when comparision fails." into oc-mr1-dev

Merge "Hide the SEND_EMBMS_INTENTS permission" into oc-mr1-dev

Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev
am: 0716c8e60e  -s ours

Change-Id: Iebfcbec5681f6b600c662ba1f3e705f10be79437

Merge "Low battery notification has unique sound." into oc-mr1-dev

Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev

Delete all ro.hwui.* props

Remove all ro.hwui.* tuning props and instead
calculate them from the screen resolution.

Or just hardcode them to what all devices
were hardcoding them to anyway.

Bug: 63741221
Test: Check cache size results on sailfish

Change-Id: I8b0d210572a246f4fefb076935cf5156a70c274c
Merged-In: I8b0d210572a246f4fefb076935cf5156a70c274c
(cherry picked from commit 8dc02f99d09130ace2ee738c2e689db1b3f33181)

Merge "Localization of zen mode default rules." into oc-mr1-dev

Revert "Initial support for proposed android.net.lowpan"

This reverts commit 4e0c2195dd999859f4e79cec1884326fb52a5916.

Fixes: 64111427
Test: Grabbed OC CTS binaries
Test: Extracted android-cts.zip  and from android-cts/tools directory launched ./cts-tradefed
Test: On the DUT (running build which has this CL cherrypicked), ran the below (will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: Note, while b/64111427 is fixed, this uncovered b/64560640

Change-Id: I1d2132678281a917f03c69d5ead1d28313d7f46d
Merged-In: Icab67ba2c40bc02968e3f8ed2da5a4a3be6cf77f

Merge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into oc-mr1-dev

Merge "Fix handling of @removed APIs." into oc-mr1-dev

Fix the strings accordingly for policy transparency dialogs

Bug: 64555046

Test: Built and observe the strings.

Change-Id: If0343d701dee24d392b0578131e50b9002433a9b

ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8.

Bug: 64493351
Test: cts-tradefed run cts-dev -t android.appsecurity.cts.ClassloaderSplitsTest -m CtsAppSecurityHostTestCases
Change-Id: Ib4868c1e0320002f5122193621e9ab56fe34819f

Merge "PackageParser: Parse android:classLoader during the full parse." into oc-mr1-dev

Merge "Remove config_demoModePackage resource" into oc-dr1-dev
am: 934a1081fe

Change-Id: I31ce02bfd8c736d8e0d46173759558faf7a6cc2f

Merge "Remove config_demoModePackage resource" into oc-dr1-dev

Merge "Add permission check before setMain()" into oc-mr1-dev

Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
am: 256fe97329

Change-Id: I2938b5aab766f236d351d66e8912cc05091502fc

Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev

Merge "Add settings and reset operations for demo users" into oc-dr1-dev
am: 88710dead0

Change-Id: Id1b8515e9323731f7bacd55d850460f00fc2c651

Merge "Add settings and reset operations for demo users" into oc-dr1-dev

Merge "Go: add features for low ram / normal ram devices." into oc-mr1-dev

Merge "Add metric constant for settings preference int value change." into oc-mr1-dev

Remove config_demoModePackage resource

Bug: 62712426
Test: lunch walleye-eng && make -j19
Change-Id: Ifa1080d85222a43871598eaf0fe9813625d9115d

Merge "FingerprintService should release wakelock only if isHeld" into oc-mr1-dev

Merge "Don't lock down system user in demo mode" into oc-dr1-dev
am: 4f540fe8d0

Change-Id: Ib4670a8e4685a9f9bd933ccba9878bd59ccb6059

Add settings and reset operations for demo users

- Allow Global settings to be set in demo mode
- Allow Secure settings to be set by demo users
- Allow fully enabling apps for demo users
- Send enable broadcast as foreground broadcast

Bug: 62712426
Test: runtest -c \
com.android.server.devicepolicy.DevicePolicyManagerTest \
frameworks-services

Change-Id: Icd5d1eda12aa6b97bd4770713710a982bb0fc8e5

Merge "Don't lock down system user in demo mode" into oc-dr1-dev

FP permission checks should not crash system process

Fixes: 62335242

Test: modify FingerprintManager, check that system_server doesn't crash.
If the application tries to fake the opPackageName, they will receive
a SecurityException from appOps

Change-Id: I0ea213ca1b2c63811573405945a9fcda19472529

Merge "Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev am: a4b5e0893f" into oc-mr1-dev

Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev
am: a4b5e0893f

Change-Id: I5e79cbadd085c2ce3eacae628388ce13bdded508

Merge "DropBoxManagerService: Don't store redundant information" into oc-mr1-dev

Go: add features for low ram / normal ram devices.

Automatically populated from ActivityManager.isLowRamDevice().

Test: manual

Change-Id: I027b8ae0205c9793a91ffdd2635479610a62aff9

Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev

Merge "Fix BLE scan leaks" into oc-mr1-dev

Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-dr1-dev
am: b9a56a4af7  -s ours

Change-Id: Ib675b2f620cb2a3f57aa1ad3f1cbe891d24102e4

Hide the SEND_EMBMS_INTENTS permission

Bug: 64340162
Change-Id: Ia9370c0e80bb3a99df5008febc994846204272c1

Merge "Revert multi-package APK flag to off." into oc-mr1-dev

Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-dr1-dev

Merge "Don't set inset frame for letterboxed app in fullscreen" into oc-dr1-dev
am: 7afbe54e0d

Change-Id: I9e3d26c49742cde534ade6a8568e0d021d6e2321

Merge "Support copying from index8 into another index8." into oc-dr1-dev
am: f112fde96d  -s ours

Change-Id: I28e0f5b34ea30d1a8edaa3858b2bb569612a57e5

Merge "Don't set inset frame for letterboxed app in fullscreen" into oc-dr1-dev

Merge "Support copying from index8 into another index8." into oc-dr1-dev

Merge "WifiManager: update docs on setWifiEnabled" into oc-dr1-dev
am: 54233f96d7

Change-Id: I47400de6e07c228e48c1467060a2179af9e4b4d9

CharSequenceTransformation should not change anything when comparision fails.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.CharSequenceTransformationTest#testMismatch
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Fixes: 64482785

Change-Id: Ia6036e0a1c6f5f084e6b13c7bdd3a9e24be7ac1a

Merge "WifiManager: update docs on setWifiEnabled" into oc-dr1-dev

Merge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev
am: 75384f617d

Change-Id: I693a3cf37c55085eee470091edf5fff0bc62ece8

Merge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev

Add permission check before setMain()

Test: make; cts-tradefed; run cts -m CtsTvTestCases;
Bug: 64489430
Change-Id: I1365165eb1ba76b3a54a3141cc19e8245c99f279

Removed isUserStoppingOrShuttingDownLocked

It was causing issues when user state was removed (or user was never
started).
Replaced it with isUserRunningLocked which returns false if user state
is null/shutdown or stopping.

Test: manual - create/switch to/from guest user
Bug: 64319208
Change-Id: I88dae7111692e760b10cd7db13d5cd17dae2f2cb

Merge "Fix BLE scan leaks" into oc-dev am: 6e749c392b
am: 3e832cf58e

Change-Id: I4edafeb10fcb2dabffe2b139893ae18139930656

Merge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev
am: f89e462bc7

Change-Id: Iead3762d5064362fbc37be960d744d68b9f7b31d

Merge "Fix BLE scan leaks" into oc-dev
am: 6e749c392b

Change-Id: I35705a81a45d2c7fd48f021a5e0e93e1709c6876

Merge "Light alarm activity tracing" into oc-mr1-dev

Add metric constant for settings preference int value change.

Bug: 64485529
Test: build
Change-Id: Ib9f04ce8f1ff671196c3f269c555288fcc0df35c
Merged-In: Ic5733fc48bc6cab6a9ada73b9e531f9fde787240

Merge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev

Merge "Fix BLE scan leaks" into oc-dev

Low battery notification has unique sound.

Change-Id: I51c8e099da04d4bf1a55d081c9fce7fc8fb90bd1
Fixes: 63853037
Test: runtest systemui

Merge "Fixes recents from disappearing when split and restarted" into oc-mr1-dev

Localization of zen mode default rules.

Test: runtest -x frameworks/base/services/tests/notification/src/com/android/server/notification/NotificationManagerServiceTest.java
Test: runtest -x frameworks/base/services/tests/notification/src/com/android/server/notification/ZenModeHelperTest.java
Change-Id: If7c38e5da56dd171e296182ef2c36e7286666ec5
Fixes: 38128497

Merge "Make rounded corners handle color inversion" into oc-dr1-dev
am: ca91e6cecd

Change-Id: I9d701444957cae9395f23537df63a76498ede87b

Merge "Make rounded corners handle color inversion" into oc-dr1-dev

Merge "Bring home to front behind assistant stack when needed." into oc-dr1-dev
am: 0a3684eb45

Change-Id: Ic1be6d9c3336fe78d1a7beb06d712fd88fa2e9ed

Merge "Bring home to front behind assistant stack when needed." into oc-dr1-dev

Merge "Allow SMS and calling for demo users" into oc-dr1-dev
am: 4387d3a523

Change-Id: I163963c15c009eaf70907203cf941e182409eafc

Merge "Rate limit notifyColorsChanged()" into oc-mr1-dev

Merge "Allow SMS and calling for demo users" into oc-dr1-dev

Reset fingerprint lockout upon successful unlock

FingerprintSettings should not start listening for fingerprints until
after Pin/Pattern/Pass is entered

Fixes: 63437524
Fixes: 63739006

Test: open FP settings, touch an invalid finger 5 times
close FP settings, re-enter FP settings, enter Pin/Pattern/Pass
touch FP with valid finger, should not be in lockout mode

Change-Id: I9b322248b30f3c4f49414e5bc0693f03a8f2dbe4

Merge "Add future consideration for USB rndis notification handling" into oc-dr1-dev
am: 15fbf9786d

Change-Id: Ic924639baa940363f5a29161bebc74f33b97165d

Merge "Fix race condition in binder thread" into oc-dr1-dev
am: 33e014b9bc

Change-Id: I5e98f321a23a5c99b321c10c59bbbc55b308bbf9

Merge "Add future consideration for USB rndis notification handling" into oc-dr1-dev