Commit Graph

848327 Commits

Author SHA1 Message Date
Jackal Guo
14a571edf3 [automerger skipped] [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED am: 0587cd294a am: 41d97a7879 -s ours am: 579d098add -s ours am: a17da6d6ef -s ours am: ae1636ca8c -s ours am: 5bdc3c5123 -s ours am: 98c2920533 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I447da260ceec466aa1c3e5f1a2228ab7e0f5aa9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:27:29 +00:00
Jackal Guo
270689b8e2 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into sc-dev am: 2f4226e5cb am: 2a561ed624 -s ours am: 2793378968 -s ours am: 217c0dceda -s ours am: ab3795cf76 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1daa4829dfdc43ec8d6bc11f15bdf8d56a524204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:27:02 +00:00
Jackal Guo
1c5c4e086f Merge changes from topic "presubmit-am-37de191e8f264fc2890d1cc94278eaff" into sc-qpr1-dev am: e531ea8f9c am: 1142d566df am: 1e5a603fe8 am: 9b541bda80
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20302364

Change-Id: I3f2cc52440030cfa6651a1d5b9d4644c8bfbaac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:26:01 +00:00
Jackal Guo
6879aa82ff [automerger skipped] [automerge] [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED 2p: 1748c4e356 am: 9d420343c1 -s ours am: 9e4b6d0a3d -s ours am: e297ec8345 -s ours am: 9d1df53364 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ed6991972b18da9516bd21869d4d64221357659
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:25:44 +00:00
Jackal Guo
bd72f8c23c [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into sc-v2-dev am: a74b09c26b -s ours am: b0680b8b95 -s ours am: bea1b21d24 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6ac54d5b53918e836293d907fc9070cc22a2f509
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:25:16 +00:00
Jackal Guo
33d1b9d9d3 [automerger skipped] [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED am: 9baf03004b -s ours am: 25d21addaf -s ours am: 7cd40f6df5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id5445cfc13ea9ceb6c463443bdc72e0da786fdfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:25:07 +00:00
Automerger Merge Worker
8f0de7c050 Merge changes from topic "am-11d32fc69ab64e319ce97e7004018f84"
* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into tm-dev am: 55c6e878ab am: 232b1ec960 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED am: 94b10bba20 am: 1b55554487 -s ours
2022-11-14 14:24:58 +00:00
Automerger Merge Worker
80d2e296d5 Merge "Merge "Don't generate a Dagger component for GlobalRootComponent." into tm-qpr-dev am: 2d33bc5c8f am: 3941194447" 2022-11-14 14:24:56 +00:00
Jackal Guo
8ffb43f23d [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into tm-dev am: 55c6e878ab am: 232b1ec960 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2136bea0739583a94db7ad4c63631ae025b4cffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:24:44 +00:00
Jackal Guo
e5458cb844 [automerger skipped] [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED am: 94b10bba20 am: 1b55554487 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2452ee6c044603da8387334260f1967964ec12a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:24:36 +00:00
Automerger Merge Worker
f682f53d6f Merge changes from topic "am-8135f9c73bad40ba8d8c022dda70f25b"
* changes:
  [automerger skipped] Merge "Disable click on privacy chip before provision" into sc-qpr1-dev am: 40665a799a -s ours am: 5398a2e587 -s ours am: 3001331cd7 -s ours am: 74547b4086 -s ours
  [automerger skipped] Disable click on privacy chip before provision am: bf4d73f6ba -s ours am: a711b14239 -s ours am: 0e5a93edaa -s ours am: 045f9efab3 -s ours
2022-11-14 14:24:28 +00:00
Dave Mankoff
8feb8b5939 Merge "Don't generate a Dagger component for GlobalRootComponent." into tm-qpr-dev am: 2d33bc5c8f am: 3941194447
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20443377

Change-Id: I932b8801c2642ec1643380964d6a40f7930414ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:24:25 +00:00
Automerger Merge Worker
ade01970d7 Merge "Merge "Make multi-instances split opt-in based" into tm-qpr-dev am: 1e20bf871c am: 018d33893a" 2022-11-14 14:24:17 +00:00
Fabian Kozynski
95f072fa65 [automerger skipped] Merge "Disable click on privacy chip before provision" into sc-qpr1-dev am: 40665a799a -s ours am: 5398a2e587 -s ours am: 3001331cd7 -s ours am: 74547b4086 -s ours
am skip reason: Merged-In I9c8f642976f3332f4d5c9db89a4917dae501f251 with SHA-1 d5038c7253 is already in history

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

Change-Id: I078ed8d84e5f6b85dd4c9d6e42c31934c2ec1938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:24:17 +00:00
Fabian Kozynski
0752d827d4 [automerger skipped] Disable click on privacy chip before provision am: bf4d73f6ba -s ours am: a711b14239 -s ours am: 0e5a93edaa -s ours am: 045f9efab3 -s ours
am skip reason: Merged-In I9c8f642976f3332f4d5c9db89a4917dae501f251 with SHA-1 d5038c7253 is already in history

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

Change-Id: I0088f67a12f2329e17ee8f486d6f29e70b96e703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:24:07 +00:00
Jerry Chang
026d936ec3 Merge "Make multi-instances split opt-in based" into tm-qpr-dev am: 1e20bf871c am: 018d33893a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20295364

Change-Id: I16be9c0ce748743b4e90ed4d1c69c735439d4b24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:23:46 +00:00
Yuri Lin
2105813229 [automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into tm-dev am: e80f89c294 -s ours am: 79e404ff92 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie62ab40bd1c2d336f59e6bec352c65637a76d645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:23:39 +00:00
Yuri Lin
2e74686ec0 [automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: e801502368 -s ours am: 387131cff7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ided34cfdd5d5f9d6550e0099b0ab93b67b5ea994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:23:19 +00:00
Yuri Lin
e188c2a6e8 [automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into tm-dev am: b1ace5c498 -s ours am: 1c1d0d6c34 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I23d17ab1c24a3805808a2cc788831d56ab856344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:23:09 +00:00
Yuri Lin
61bead05cc [automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: ebbcea2701 -s ours am: 3a8dee03f9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iffc83b1663d6708fcaf3dad9a2b7f400bcf4558f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:23:00 +00:00
Fabian Kozynski
b90aaef525 Merge "Disallow clicks on privacy chip before provisioned" into tm-dev am: d19f3a7862 am: 05bb769796
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20327583

Change-Id: I940d4bc6df861524e82e296f4eadfb36b3e48aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:21:40 +00:00
Yuri Lin
5971e56586 [automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into qt-dev am: 020e76f630 am: 4278c4fff8 -s ours am: 71bfa22c30 -s ours am: ea7cb4db90 -s ours am: 92ac6fa92c -s ours am: 9cccc2dde7 -s ours am: f7cfab78d3 -s ours am: 095a7fafd7 -s ours am: baa094c209 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3729be2917c622cfdbcfee2524f59fab702a55d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:20:42 +00:00
Yuri Lin
c9fcc5e889 [automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 7fcdd1fa0e am: aa82e1c91c -s ours am: ee98ca9b78 -s ours am: 85d658cc5a -s ours am: 146685b3ef -s ours am: 9298e99970 -s ours am: a156dc4234 -s ours am: 041d1aeb24 -s ours am: 93814c6a65 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I217dbc7b22b4b36277f6b59707ee4d6bd1f5a497
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:20:33 +00:00
Yuri Lin
fc61e875ca [automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into qt-dev am: 0852b61db1 am: 74525f50a7 -s ours am: 349169cfc1 -s ours am: b74d0aa220 -s ours am: 8382cbfd16 -s ours am: 24492124d0 -s ours am: 7ab3660a0b -s ours am: 887df073e3 -s ours am: 9e3cd0a76a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia710f6390c7a90d0ce84b12496f94e611449c7c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:20:24 +00:00
Yuri Lin
2da187af9b [automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: d8d16111a1 am: 6381a6192f -s ours am: 608586c08a -s ours am: c97d507be7 -s ours am: f112408309 -s ours am: ac1984f349 -s ours am: de68d2c411 -s ours am: ddb01e4cc0 -s ours am: 3a58d46753 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie5139bc134de52668046c803967bde8270e3d886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:20:16 +00:00
Yuri Lin
0548b78c17 [automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into rvc-dev am: da89ac7e3c -s ours am: 88e833e696 -s ours am: db3a12a93c -s ours am: db778b8ca1 -s ours am: 9c8a89396c -s ours am: 10c7240805 -s ours am: 7a79d2d622 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8f03f746a6412c6a3f177cce8c0e93e4547c5887
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:19:18 +00:00
Yuri Lin
acf5dca8e4 [automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 8de098ee2f -s ours am: 5293d5277d -s ours am: ca1ac4748b -s ours am: f67c2d8c0f -s ours am: 8a4fb2556f -s ours am: 18c425aad1 -s ours am: adaba780ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaa3c57475bf0bee989ece5257af57d2864d103e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:19:03 +00:00
Yuri Lin
440b5da027 [automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into rvc-dev am: 651383dda6 -s ours am: 68af017762 -s ours am: 587867b7e2 -s ours am: a99f8defc6 -s ours am: ed175d9020 -s ours am: 259295079f -s ours am: 3093ebd609 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic5e258350209ccbc1eae372dbb452cd93d995391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:18:54 +00:00
Yuri Lin
1244e1c0d6 [automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: 2643890445 -s ours am: 696c53ab13 -s ours am: 4050da310c -s ours am: 093dd49b97 -s ours am: 7a34a57bca -s ours am: 7d1ce79e8b -s ours am: 239eb946f3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic1fde6ec6fc450a83083364771993721010c01d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:18:45 +00:00
Yuri Lin
0668e24bbf [automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into rvc-qpr-dev am: 543b401329 -s ours am: f56d70b80b -s ours am: fc8bb63878 -s ours am: 901637321e -s ours am: 8da3d7ebe7 -s ours am: 04f065e472 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I215406a9e374f3a7eb0b863a70b78ed1c131eae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:17:34 +00:00
Yuri Lin
03185a7814 [automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 9631f58f21 -s ours am: ea4f802c09 -s ours am: 6f7ee54f3d -s ours am: ad310bb894 -s ours am: aed9e21639 -s ours am: e53958cdf2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia01ad2ee0c8447ca5c6d4581d79cc3c820b6806e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:17:26 +00:00
Yuri Lin
aaddd38d6c [automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into rvc-qpr-dev am: aad71ae8d8 -s ours am: 3f90b84011 -s ours am: 9da4a79e7e -s ours am: 62a472683f -s ours am: 582819d96d -s ours am: 3bdcd8a212 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I56c738920bbda585f830d79b0b5faa2a20322d97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:17:18 +00:00
Yuri Lin
285e365220 [automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: 7c0ae1bdcc -s ours am: 256ebf4a87 -s ours am: aa5661b8af -s ours am: 18d6a090b2 -s ours am: f0fe7151b7 -s ours am: 661720e151 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I03b71ecf04d2532a762e81c43aaa3d7cdb519526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:17:10 +00:00
Yuri Lin
a7418207d0 [automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into sc-dev am: d04e7381c8 am: 00ff6a995f -s ours am: dac6674f96 -s ours am: 369fde390d -s ours am: 324253a99e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8d12f251276beda9009feea4bac64c66270de25c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:15:57 +00:00
Yuri Lin
481d4ce9db [automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: 3bba7fb184 am: b203e9f9c2 -s ours am: caf62df2b1 -s ours am: 84ea6eecda -s ours am: 6fbfe4cd05 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I12eb8e02d95efbe53a412a1da486a765a102b2d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:15:47 +00:00
Yuri Lin
c3f2f9c44a [automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into sc-dev am: 1585f7c77d -s ours am: f80526cbef -s ours am: 11aed95336 -s ours am: a5283fc065 -s ours am: 63e80f94bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id8a775f05d197ed68dcddc1c25752b7bb3e980de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:15:11 +00:00
Yuri Lin
758866373f [automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 7deb6e4565 -s ours am: 6fbb8bd7f2 -s ours am: b22722a0f3 -s ours am: c84ac8093c -s ours am: 113483da7d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I826fbe04712152e30744d3f6c42a239fdf938f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:14:59 +00:00
Yuri Lin
25396167aa [automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into sc-qpr1-dev am: 15b2a7d593 -s ours am: 0b49769300 -s ours am: d5b2053362 -s ours am: fc02d92db2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia806ebb575a93bfa5be2dafa46062ed59a9372bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:14:12 +00:00
Yuri Lin
e8cf9e4893 [automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: 8c21e3f5cb -s ours am: 82ca16edfe -s ours am: 79cd6400a1 -s ours am: 039264f309 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I23e6ce42c4277609faffdcfc4ecafc21b5925071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:14:03 +00:00
Yuri Lin
0b1866de40 [automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into sc-qpr1-dev am: e86aa60071 -s ours am: ab080cd4ed -s ours am: 0488430a2a -s ours am: e55b0eee89 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I987f404ee156ed4fbb6eea41c37f9d4b81b0cc21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:13:55 +00:00
Yuri Lin
0da1c0c24e [automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: f12f2d461e -s ours am: 2c57dbe998 -s ours am: 23faeff8be -s ours am: 4ff7409501 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibad54ede0a783a0e971d0ccc6fb317eb18483524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:13:47 +00:00
Yuri Lin
9172800934 [automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into sc-v2-dev am: 037ec4b4a2 -s ours am: 2509cbd548 -s ours am: 30c52e8d17 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iff6740a6e5fdf095089c8019f194f70d3260df61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:13:00 +00:00
Yuri Lin
2c7f7b5845 [automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: 36c2974dcb -s ours am: cc3f566015 -s ours am: adf0ed0895 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iac29ce447db3d186485dde0c12259e873b58e373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:12:51 +00:00
Yuri Lin
69e99fea5c [automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into sc-v2-dev am: 947d313053 -s ours am: 69cb65e1ac -s ours am: 279aaa8b7e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ec904a266729e978380939f9997cdaccdfa317d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:12:22 +00:00
Yuri Lin
f5ee2fe7b0 [automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: a8bdabf903 -s ours am: 84766f4716 -s ours am: 4dd93e9ea9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I75b9e8b7bab9eee5fb56b358879ddc5cd7755594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:11:49 +00:00
TreeHugger Robot
72f349772e [automerger skipped] Merge "[DO NOT MERGE] Disallow clicks on privacy chip before provisioned" into sc-v2-dev am: 8579c6ee65 -s ours am: 427d692450 -s ours am: 54cd5b77d6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4c80a641a42ec971557f4b30b0b7dc27d74e686d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:10:36 +00:00
Fabian Kozynski
a960cc2e1d [automerger skipped] [DO NOT MERGE] Disallow clicks on privacy chip before provisioned am: d5038c7253 -s ours am: f088cab69d -s ours am: c545bffbfb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6dad2a79dc005b2789a641872f1ac69ac47f38cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:10:28 +00:00
Winson Chung
df64ac77dc Merge "Ensure that only SysUI can override pending intent launch flags" into qt-dev am: c741c6211c am: 41bf4e7cba am: 7adf19f3fa am: 99f48340ac am: 2dc64f374a am: e8f89077cd am: 87b44f8bec am: e288ef9d48 am: 346bf957ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20219552

Change-Id: I3ac97e77170ce562f415d680a0e02d692be9f63a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:09:38 +00:00
Iván Budnik
a87b0f935b [automerger skipped] Merge "Enforce MediaButtonReceiver ComponentName belongs to app" into sc-dev am: 047202c00b -s ours am: 1d569978b7 -s ours am: 28f0b43a6e -s ours am: c739ccfa88 -s ours am: 4994aca3a4 -s ours
am skip reason: Merged-In I4aba866a9758366175ea4af0d434729ad98fa48d with SHA-1 863d396f4c is already in history

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

Change-Id: I544734091c394b3c100ded279c0d86e5f7029eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:08:49 +00:00
Iván Budnik
ecd8aed676 resolve merge conflicts of ef33f4c1c8 to tm-dev am: 7647712c61 am: 03785dc3bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20402711

Change-Id: I9e00ed8e8cf505c475fabc9e7c58ccb390121353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 14:07:46 +00:00