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



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

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



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

Bug: 308989388
Bug: 307532206
Test: atest android.content.pm.cts.PackageManagerTest
Change-Id: I840c9c9af5752b3901d4719a13e7908faa43ab04
Merged-In: I840c9c9af5752b3901d4719a13e7908faa43ab04
(cherry picked from commit 1f445474)

Bug: 308989388
Bug: 307532206
Test: atest android.content.pm.cts.PackageManagerTest
Change-Id: I840c9c9af5752b3901d4719a13e7908faa43ab04
Merged-In: I840c9c9af5752b3901d4719a13e7908faa43ab04
(cherry picked from commit 1f445474)

Bug: 303905130
Bug: 316893159
Test: manual
Merged-In: I3632c503097da771954aee460df49cbfab496a74
Change-Id: Ib4cebf1750fc6324dc1c8853e0d716ea5e8ec073

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



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

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



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

 Prevent DoS attack that causes boot-looping by serializing a huge amount of snoozed notifications:
  - Check snooze limits for persisted notifications
  - Remove persisted group summary notification when in-memory counterpart is removed
  - Prevent unpriviledged API calls that allow 3P apps to snooze notifications with context/criterion

Test: atest SnoozeHelperTest
Test: atest NotificationManagerServiceTest
Bug: 307948424
Bug: 308414141

Change-Id: I3571fa9207b778def652130d3ca840183a9a8414
(cherry picked from commit 965ff2d3)
Merged-In: I3571fa9207b778def652130d3ca840183a9a8414

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Check permission of Autofill icon URIs" into rvc-dev am: 8bbd2c97 -s ours

am skip reason: Merged-In I48879174664b70ced90492bb0991dc91cbf89b79 with SHA-1 9b03491b is already in history

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



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

[automerger skipped] [RESTRICT AUTOMERGE] Check permission of Autofill icon URIs am: 91fb9494 -s ours

am skip reason: Merged-In I48879174664b70ced90492bb0991dc91cbf89b79 with SHA-1 9b03491b is already in history

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



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

Merge "Restrict activity launch when caller is running in the background" into rvc-dev am: dce6a262

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



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

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



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

Merge "DO NOT MERGE: "Hide" /Android/data|obb|sanbox/ on shared storage" into rvc-dev am: 1d28c472

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



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

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



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

Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from background." into rvc-dev am: 9c2ddfc6

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



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

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



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

Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128

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



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

Test: Flashed device and verified dream settings works as expected
Test: Installed APK from bug and verified the dream didn't allow
launching the inappropriate settings activity.
Fixes: 300090204

Merged-In: I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716
Merged-In: I146415ad400827d0a798e27f34f098feb5e96422
Merged-In: I7f2351fc7d9a82778ce21f67018a45ac67c9aaf8
Change-Id: I573040df84bf98a493b39f96c8581e4303206bac

* SaveUI's template
* Inline Suggestions slices

Fixes: b/286235483
Fixes: b/292104015

Test: atest CtsAutoFillServiceTestCases

Change-Id: I48879174664b70ced90492bb0991dc91cbf89b79
Merged-In: I48879174664b70ced90492bb0991dc91cbf89b79

* SaveUI's template
* Inline Suggestions slices

Fixes: b/286235483
Fixes: b/292104015

Test: atest CtsAutoFillServiceTestCases

Change-Id: I48879174664b70ced90492bb0991dc91cbf89b79
Merged-In: I48879174664b70ced90492bb0991dc91cbf89b79

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



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

Log to detect usage of whitelistToken when sending non-PI target

Log ActivityManagerService.sendIntentSender if the target is not a
PendingIntent and a non-null whitelistToken is sent to the client.
This is simply to detect if there are real cases this would happen
before we decide simply remove whitelistToken in that case.

Do not pass  whitelistToken when sending non-PI target

In ActivityManagerService.sendIntentSender, if the target is not a
PendingIntent, do not send whitelistToken to the client.

Bug: 279428283
Test: Manual test
Change-Id: I017486354a1ab2f14d0472c355583d53c27c4810

Test: test on device + atest-src BackgroundActivityLaunchTest#testBackgroundActivityBlockedInStartNextMatchingActivity
Bug: 230492947
Merged-In: I1a0c13e74622d301866efaca1b5351a6b241ebe5
Change-Id: I7ae88eb62e435b9a77d2a724c5a953fe1f35b838

Implement shouldHideDocument() in the ExternalStorageProvider so that it
resitcts access to 'Android/data/', 'Android/obb/' and 'Android/sandbox'
on the integrated shared storage along with all their content and
subdirectories.

Clean up the abstract FileSystemProvider, specifically all variants of
queryChildDocuments().

Bug: 200034476
Bug: 220066255
Bug: 283962634
Test: make & flash systemimage, run manually
Test: atest ExternalStorageProviderTests
Merged-In: I48c2ce7ff2d7fc067961ea2af0ea63818316f086
Change-Id: I48c2ce7ff2d7fc067961ea2af0ea63818316f086

Test: atest TileLifecycleManagerTest
Test: manual: adb shell dumpsys activity service
Test: sts test
Bug: 300903792
Change-Id: Ia8126ac65432b124683960e3ebf47301ba6172a1
Merged-In: Ia8126ac65432b124683960e3ebf47301ba6172a1

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



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

This reverts commit 18a2f95b.

Reason for revert: b/304531493

Bug: 231476072
Change-Id: I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50
Merged-In: I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50

[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 447216ec -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 3ab14638 is already in history

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



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

Bug: 295335110
Test: Test app with long component name
Change-Id: I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579
Merged-In: I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579