Commit Graph

786604 Commits

Author SHA1 Message Date
TreeHugger Robot
18e26e63e9 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-02 03:31:14 +00:00
Bryce Lee
7dd0196e53 Merge changes from topic "267565290" into tm-qpr-dev
* changes:
  Allow swiping down notification shade over dream.
  Allow in-progress touch sessions to continue outside resume.
  Correct display dimensions considered.
  Suppress transient bars over dreams.
2023-04-02 03:26:57 +00:00
Mark Renouf
c709566321 Merge "Prevent sharesheet from previewing unowned URIs [RESTRICT AUTOMERGE] (corrected)" into tm-qpr-dev 2023-04-01 00:21:47 +00:00
Bill Yi
97f070edcd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I31e113f71f6cb930389730dea881925134effb7f
2023-03-31 15:46:04 -07:00
Bryce Lee
67c703c945 Merge "Capture IllegalArgumentException when unregistering dock receiver." into tm-qpr-dev 2023-03-31 21:01:01 +00:00
Jeff DeCew
8e7c469bd1 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into rvc-dev am: 2f02357e1d am: 00254f69ef -s ours am: 27502189f4 -s ours am: 18380d2e2f -s ours am: 168a08d94d -s ours am: 0c702a76a3 -s ours am: 93694f3f7c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id829a897259306ce2c2e294e161dfb547f95b890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 20:13:03 +00:00
Jeff DeCew
b12365950d [automerger skipped] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI am: c60e264a55 am: fcb0f9a684 -s ours am: bc8c22c943 -s ours am: b79c932285 -s ours am: 5df48205d0 -s ours am: f94885ec17 -s ours am: c5c0416873 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2422e50162af41e1e7f39a2381ceb9f0017d1db4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 20:12:44 +00:00
Ikram Gabiyev
6ccf5e7044 Merge "Remove pip resize flicks" into tm-qpr-dev 2023-03-31 19:45:39 +00:00
Jeff DeCew
93694f3f7c [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into rvc-dev am: 2f02357e1d am: 00254f69ef -s ours am: 27502189f4 -s ours am: 18380d2e2f -s ours am: 168a08d94d -s ours am: 0c702a76a3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifc8cfae0475fe1864d50f61db121d9883c8f97f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 19:42:39 +00:00
Jeff DeCew
c5c0416873 [automerger skipped] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI am: c60e264a55 am: fcb0f9a684 -s ours am: bc8c22c943 -s ours am: b79c932285 -s ours am: 5df48205d0 -s ours am: f94885ec17 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia90564474e393b941b879e7101f59bbada3c563e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 19:42:19 +00:00
Jeff DeCew
0c702a76a3 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into rvc-dev am: 2f02357e1d am: 00254f69ef -s ours am: 27502189f4 -s ours am: 18380d2e2f -s ours am: 168a08d94d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9f438e8a8ad361745073b186208be986fea0920f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 19:11:52 +00:00
Jeff DeCew
f94885ec17 [automerger skipped] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI am: c60e264a55 am: fcb0f9a684 -s ours am: bc8c22c943 -s ours am: b79c932285 -s ours am: 5df48205d0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I861ed8ccc3565c01d990a76259d8b156b97be6d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 19:10:55 +00:00
Mark Renouf
4b0f6503cc Prevent sharesheet from previewing unowned URIs [RESTRICT AUTOMERGE] (corrected)
This is the corrected cherry-pick of
2a08fce4eb from master.

Bug: 261036568
Test: manually via supplied tool (see bug)
Change-Id: I1ac57c8eb2f509b19c278aacb8e88772095854f7
Merged-In: I83e93c373538460e38ec17f1fd8e39d7aea95c10
2023-03-31 18:23:08 +00:00
Jeff DeCew
168a08d94d [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into rvc-dev am: 2f02357e1d am: 00254f69ef -s ours am: 27502189f4 -s ours am: 18380d2e2f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib0ee25ed125bcd72ec094d232deef4b1227b7e6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 18:09:43 +00:00
Jeff DeCew
5df48205d0 [automerger skipped] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI am: c60e264a55 am: fcb0f9a684 -s ours am: bc8c22c943 -s ours am: b79c932285 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia12d95112b82dddad8164071ccf61b869a38f7ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 18:09:34 +00:00
Jeff DeCew
18380d2e2f [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into rvc-dev am: 2f02357e1d am: 00254f69ef -s ours am: 27502189f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If6e5597bc9b6d8d215be0b4ca75e4dafc42b7ce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 17:37:39 +00:00
Jeff DeCew
b79c932285 [automerger skipped] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI am: c60e264a55 am: fcb0f9a684 -s ours am: bc8c22c943 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie06c86a7e1670878ee961c46c9f4cb18d7deccab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 17:37:23 +00:00
Ikram Gabiyev
a0253fb493 Remove pip resize flicks
Remove flicks after quickly user-resizing pip
by making sure touches are not enabled while
final window updates are ongoing.

Bug: 274682042
Test: manually reproduce the steps in the bug
Change-Id: I506cb3197ac2cd10a3906c9466c90278e8cc59f5
2023-03-31 17:24:09 +00:00
Pavel Grafov
2bc6696bae [automerger skipped] Merge "Enforce DevicePolicyManager.setUserControlDisabledPackages in AppStandbyController" into rvc-dev am: b4083e039e am: 0e7ecf6fbe -s ours am: a95419098d -s ours am: e6871844eb -s ours am: 769a0d367a -s ours am: 933ad6e1c8 -s ours am: 7bc82e9e2b -s ours
am skip reason: Merged-In I4279dc37f0e17aedb1c2a87468478248443a253e with SHA-1 3dbab873d6 is already in history

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

Change-Id: I99c62f5c4b75c42313498fec8d50ef2d29194b51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 17:17:37 +00:00
Jeff DeCew
ed719644df [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into sc-dev am: 5a56907a3b am: bb4092a3c5 -s ours am: b988286b0a -s ours am: 3947d1cda5 -s ours am: 2d6da22404 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5325b950296b271f327894272ca1ad8fc4055fd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 17:15:40 +00:00
Jeff DeCew
bf568f1ce5 Merge changes from topic "presubmit-am-2613dc5aeb9b4fa1a17905710745009a-sc-dev" into sc-qpr1-dev am: af5c39e766 am: 255a79d3e4 am: 6f858f96e5 am: aef1025c19
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312923

Change-Id: I406645ab625a64f0720df2d92b8167bb9d500197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 17:14:28 +00:00
Jeff DeCew
27502189f4 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into rvc-dev am: 2f02357e1d am: 00254f69ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I28859423df53912870b61b803bc9b97f753be923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 17:10:50 +00:00
Presubmit Automerger Backend
a0f6ce97c8 [automerger skipped] [automerge] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI 2p: 1bc1be92ce am: c6c294f175 -s ours am: bd8ae58033 -s ours am: 0b1715cb66 -s ours am: acd9aca5d8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1f7d65532ebf1c432dcb3c4d0bcaa75ea303a49a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 17:10:18 +00:00
Jeff DeCew
bc8c22c943 [automerger skipped] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI am: c60e264a55 am: fcb0f9a684 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3007fb4b8bb63745b426966ea7336137779e11e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 17:08:03 +00:00
Jeff DeCew
8552c7c0ca [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into sc-v2-dev am: bfbbf35902 -s ours am: b69f509ffa -s ours am: 9c712c6260 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib702e734e5835979d4dba70cebf62e574952a0ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 17:07:39 +00:00
Jeff DeCew
faec423735 [automerger skipped] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI am: 50c9d48802 -s ours am: 6cfc4b7400 -s ours am: c89ad66b7b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9e5dbf1acefdfba382c4c2a818a163866ad184b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 17:05:33 +00:00
Jeff DeCew
f796bc1c9f [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into tm-dev am: f8e813e6c6 am: 75e518aa5e -s ours
am skip reason: Merged-In I40e1aa6377b8a60d91cb2f4189df1e9a4a4578a2 with SHA-1 af8e64dbf0 is already in history

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

Change-Id: Ie8c9f5eed8089d505da341893c2ac56ca3c2fe04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 17:03:54 +00:00
Jeff DeCew
b58296f688 [automerger skipped] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI am: e65f0c9643 am: 393737790e -s ours
am skip reason: Merged-In I40e1aa6377b8a60d91cb2f4189df1e9a4a4578a2 with SHA-1 af8e64dbf0 is already in history

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

Change-Id: If940e575b72ff451550c10f0758adf3350ac8ac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 17:02:34 +00:00
Pavel Grafov
7bc82e9e2b [automerger skipped] Merge "Enforce DevicePolicyManager.setUserControlDisabledPackages in AppStandbyController" into rvc-dev am: b4083e039e am: 0e7ecf6fbe -s ours am: a95419098d -s ours am: e6871844eb -s ours am: 769a0d367a -s ours am: 933ad6e1c8 -s ours
am skip reason: Merged-In I4279dc37f0e17aedb1c2a87468478248443a253e with SHA-1 3dbab873d6 is already in history

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

Change-Id: Iccfb40480187a38d4bcc17061ca0839d1ac1a833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 16:58:55 +00:00
Mark Renouf
9ceeb27fd7 Merge "Revert "Prevent sharesheet from previewing unowned URIs [RESTRICT AUTOMERGE]"" into tm-qpr-dev 2023-03-31 16:44:54 +00:00
Bryce Lee
5ed888c941 Capture IllegalArgumentException when unregistering dock receiver.
RotationButtonController uses a broadcast receiver to track the current
dock state. The controller is used in multiple spots, including
Launcher. The usage paths in Launcher are open to a race condition where
multiple threads might unregister the receiver, side stepping measures
to pair unregister with register.

This changelist catches the exception, which is consistent with other
broadcast receiver unregistration in Launcher.

Test: manual
Fixes: 275476588
Change-Id: I809dc66ae20675312c538498bbade0c0c8f4b828
2023-03-31 09:35:37 -07:00
Jeff DeCew
2d6da22404 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into sc-dev am: 5a56907a3b am: bb4092a3c5 -s ours am: b988286b0a -s ours am: 3947d1cda5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I304b0ca96945ad4450fc36e657a9ed19555ccabd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:55:56 +00:00
Jeff DeCew
aef1025c19 Merge changes from topic "presubmit-am-2613dc5aeb9b4fa1a17905710745009a-sc-dev" into sc-qpr1-dev am: af5c39e766 am: 255a79d3e4 am: 6f858f96e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312923

Change-Id: I11443f3d1b1c8baebb15acf4ce77840644bb0989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:55:33 +00:00
Presubmit Automerger Backend
acd9aca5d8 [automerger skipped] [automerge] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI 2p: 1bc1be92ce am: c6c294f175 -s ours am: bd8ae58033 -s ours am: 0b1715cb66 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idfe33c034f51daeea849a2f47f9b3b771f711867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:55:30 +00:00
Pavel Grafov
933ad6e1c8 [automerger skipped] Merge "Enforce DevicePolicyManager.setUserControlDisabledPackages in AppStandbyController" into rvc-dev am: b4083e039e am: 0e7ecf6fbe -s ours am: a95419098d -s ours am: e6871844eb -s ours am: 769a0d367a -s ours
am skip reason: Merged-In I4279dc37f0e17aedb1c2a87468478248443a253e with SHA-1 3dbab873d6 is already in history

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

Change-Id: I4d74ed1d206c17be976c402fb3e2719f02eee203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:45:57 +00:00
Jeff DeCew
3947d1cda5 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into sc-dev am: 5a56907a3b am: bb4092a3c5 -s ours am: b988286b0a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I45e5cabc1a9a3394d208e2fab2f4afcdd19fcfd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:43:54 +00:00
Jeff DeCew
6f858f96e5 Merge changes from topic "presubmit-am-2613dc5aeb9b4fa1a17905710745009a-sc-dev" into sc-qpr1-dev am: af5c39e766 am: 255a79d3e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312923

Change-Id: I292b1d26b42b5fc97884ee12559785b491437c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:39:20 +00:00
Presubmit Automerger Backend
0b1715cb66 [automerger skipped] [automerge] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI 2p: 1bc1be92ce am: c6c294f175 -s ours am: bd8ae58033 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7211042cab6d8ab9e2bcce6c373bf00b62acb493
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:38:41 +00:00
Jeff DeCew
9c712c6260 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into sc-v2-dev am: bfbbf35902 -s ours am: b69f509ffa -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifbd4a6668d0448fceb3fd7befe032f7e8a94ba25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:26:48 +00:00
Jeff DeCew
c89ad66b7b [automerger skipped] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI am: 50c9d48802 -s ours am: 6cfc4b7400 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9a108ffb4572ff254395510ce98bd5c299cdcc28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:26:46 +00:00
Pavel Grafov
769a0d367a [automerger skipped] Merge "Enforce DevicePolicyManager.setUserControlDisabledPackages in AppStandbyController" into rvc-dev am: b4083e039e am: 0e7ecf6fbe -s ours am: a95419098d -s ours am: e6871844eb -s ours
am skip reason: Merged-In I4279dc37f0e17aedb1c2a87468478248443a253e with SHA-1 3dbab873d6 is already in history

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

Change-Id: I874cd5ce33a17fac9ac5a43afe0dd3732d35e4b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:26:34 +00:00
Jeff DeCew
75e518aa5e Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into tm-dev am: f8e813e6c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22299207

Change-Id: I6804a247f081404111ca4ae7ccf9c011bf265bd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:26:30 +00:00
Jeff DeCew
393737790e [RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI am: e65f0c9643
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22299207

Change-Id: I56028cb239d9a0cacb723c354ce4913eba07c45e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:26:20 +00:00
Jeff DeCew
b988286b0a [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into sc-dev am: 5a56907a3b am: bb4092a3c5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0e398889592cbb47edbaf810181cd2dcd3a628c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:26:07 +00:00
Jeff DeCew
255a79d3e4 Merge changes from topic "presubmit-am-2613dc5aeb9b4fa1a17905710745009a-sc-dev" into sc-qpr1-dev am: af5c39e766
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312923

Change-Id: I1cfd207a7ff4935aece3b934904c8966a70040ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:25:36 +00:00
Presubmit Automerger Backend
bd8ae58033 [automerger skipped] [automerge] [RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI 2p: 1bc1be92ce am: c6c294f175 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9cf774a3539dfb291c8b8ebeaf02f61621514156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:25:32 +00:00
Pavel Grafov
e6871844eb [automerger skipped] Merge "Enforce DevicePolicyManager.setUserControlDisabledPackages in AppStandbyController" into rvc-dev am: b4083e039e am: 0e7ecf6fbe -s ours am: a95419098d -s ours
am skip reason: Merged-In I4279dc37f0e17aedb1c2a87468478248443a253e with SHA-1 3dbab873d6 is already in history

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

Change-Id: I08df5e5c15cd3e5a01fc68a7502031f596f7bc44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:23:46 +00:00
Jeff DeCew
bb4092a3c5 Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into sc-dev am: 5a56907a3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312923

Change-Id: Iaa53f3e5ad8ced66e3ea4d9308b6362fd8e700e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:23:23 +00:00
Jeff DeCew
00254f69ef Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into rvc-dev am: 2f02357e1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312942

Change-Id: I23244c538448eaeb0af26fc66ddbba64dffbdb65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:23:01 +00:00
Jeff DeCew
b69f509ffa [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI" into sc-v2-dev am: bfbbf35902 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7f4f18156b1f754403b3b120ebd40b5564068ef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:23:00 +00:00