Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
661,735 Commits 3 Branches 0 Tags
2f8a15c0a9980ebf45c8c023008efbc56de4eaa5
Commit Graph

661735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Louis Chang
2f8a15c0a9 [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 am: 53c6a79cfd -s ours am: b38b3eaccb -s ours am: 7ca38bea98 -s ours am: 2f75f308be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc9617eeabe6409c2777d3012e49738c5b2f6e40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 18:11:44 +00:00
Louis Chang
2f75f308be [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 am: 53c6a79cfd -s ours am: b38b3eaccb -s ours am: 7ca38bea98 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaef6c494e9fcbb2758a8e4d3fb0fe3213e3b4572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 17:31:22 +00:00
Louis Chang
7ca38bea98 [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 am: 53c6a79cfd -s ours am: b38b3eaccb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I53b370d38eee3f2c7986dea88390fb61e941c9e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 17:06:33 +00:00
Louis Chang
b38b3eaccb [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 am: 53c6a79cfd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9334f8f8223d74767a6ae95f5e74a8c9abebfd0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 16:49:12 +00:00
Louis Chang
53c6a79cfd [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518948

Change-Id: I298a415227f87fa71a196cfad35c88319f265e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 16:17:21 +00:00
TreeHugger Robot
753f094d4f [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into sc-dev am: 860327234e -s ours 
am skip reason: Merged-In I854dd825bfd9a2c08851980d480d1f3a177af6cf with SHA-1 89ebc8c43f is already in history

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

Change-Id: I5c7c93eb3edb602f3b4ace0d0e843300d0e31290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 16:16:58 +00:00
TreeHugger Robot
f0e3514d8e Merge changes from topic "new-intent-navUp-sc" into sc-mainline-prod 
* changes:
  [automerge] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo 2p: 89ebc8c43f
  [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo
 2022-08-11 15:40:55 +00:00
TreeHugger Robot
860327234e Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into sc-dev 2022-08-11 15:40:54 +00:00
Yuri Lin
0245ef047a [automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-wo9su3lsju" into rvc-dev am: 4d015c710d -s ours am: b93dab4bb9 -s ours am: badff3883f -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 55d8e634dc is already in history

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

Change-Id: Ica0e34de6dec41e17ca2d402f9903a6483db028a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 03:16:38 +00:00
Yuri Lin
47e4e53d03 [automerger skipped] Enforce zen rule limit on a package level. am: 468dd54e8b -s ours am: 1efafda612 -s ours am: adbdf8019e -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 55d8e634dc is already in history

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

Change-Id: Icd1c852b37e65b2e480f8d3cbaaadb955c8ad4e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 03:16:35 +00:00
Yuri Lin
badff3883f [automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-wo9su3lsju" into rvc-dev am: 4d015c710d -s ours am: b93dab4bb9 -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 55d8e634dc is already in history

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

Change-Id: I073b9d54e225b9ddc1dc45506966957a43a325d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 02:51:56 +00:00
Yuri Lin
adbdf8019e [automerger skipped] Enforce zen rule limit on a package level. am: 468dd54e8b -s ours am: 1efafda612 -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 55d8e634dc is already in history

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

Change-Id: Ie7fa9bbad5410c46d72f531256637c179c22aed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 02:51:28 +00:00
Yuri Lin
b93dab4bb9 [automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-wo9su3lsju" into rvc-dev am: 4d015c710d -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 55d8e634dc is already in history

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

Change-Id: I754fc047ab9b5834f905d538be92919042b12c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 02:26:26 +00:00
Yuri Lin
1efafda612 [automerger skipped] Enforce zen rule limit on a package level. am: 468dd54e8b -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 55d8e634dc is already in history

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

Change-Id: Iec40cec2312835a929ca162defc470f58bef44cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 02:26:05 +00:00
Louis Chang
b9a9340645 [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo 
The new Intent was delivered to a non-exported activity while
#navigateUpTo was called from an Activity of a different uid.

Bug: 238605611
Test: atest StartActivityTests
Change-Id: I854dd825bfd9a2c08851980d480d1f3a177af6cf
Merged-In: I854dd825bfd9a2c08851980d480d1f3a177af6cf
 2022-08-11 02:03:47 +00:00
Presubmit Automerger Backend
92b3eb6795 [automerge] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo 2p: 89ebc8c43f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518946

Bug: 238605611
Change-Id: I1e01c9c5e2a42172022f78ac041f639cc61afa37
Merged-In: I854dd825bfd9a2c08851980d480d1f3a177af6cf
 2022-08-11 02:02:19 +00:00
Louis Chang
89ebc8c43f [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo 
The new Intent was delivered to a non-exported activity while
#navigateUpTo was called from an Activity of a different uid.

Bug: 238605611
Test: atest StartActivityTests
Change-Id: I854dd825bfd9a2c08851980d480d1f3a177af6cf
Merged-In: I854dd825bfd9a2c08851980d480d1f3a177af6cf
 2022-08-11 02:01:53 +00:00
Yuri Lin
4d015c710d Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-wo9su3lsju" into rvc-dev 
* changes:
  Enforce zen rule limit on a package level.
  Fix NPE when deleting old zen rules
  Store DND rule owners
 2022-08-11 01:32:32 +00:00
TreeHugger Robot
2f253eb28a Merge "Revert "DO NOT MERGE: Revert "Make CheckOp return allowed if any..."" into sc-dev am: 5d31eda995 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19441568

Change-Id: Ibf2c81c1eac142a5d3b3cba888cfcb1706c29633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 01:21:33 +00:00
TreeHugger Robot
acc5f45848 Merge changes from topic "revert-19245451-revert-2022-20240-VLEDXGPPND" into sc-mainline-prod 
* changes:
  [automerge] Revert "DO NOT MERGE: Revert "Make CheckOp return allowed if any..." 2p: f21335c469
  Revert "DO NOT MERGE: Revert "Make CheckOp return allowed if any..."
 2022-08-11 00:54:13 +00:00
TreeHugger Robot
5d31eda995 Merge "Revert "DO NOT MERGE: Revert "Make CheckOp return allowed if any..."" into sc-dev 2022-08-11 00:54:09 +00:00
Yuri Lin
f6adfc4ef7 [automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb" into qt-dev am: 718c21f25e am: b618fee451 -s ours am: fa7e3ae758 -s ours am: a10aa3cc26 -s ours am: 9ed0b1cc6e -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: I1c98dc3642d6b020478be3c672a69f4bab26aef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 00:33:12 +00:00
Julia Reynolds
ad8cb29baf [automerger skipped] Fix NPE when deleting old zen rules am: 7bb9cd92bf am: 8a021141ff am: b953b5eff6 -s ours am: 1cb919e374 -s ours am: 5f6329c80a -s ours 
am skip reason: Merged-In I069fcc124af24227fa50b61d4fc55d6dadc7a20b with SHA-1 93aa03a0db is already in history

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

Change-Id: I3ff09ef1394ca20c7e3642104c6ebaa51505d20b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 00:32:58 +00:00
Julia Reynolds
d8b7ea0074 [automerger skipped] Store DND rule owners am: eda171cffa am: 1eaa443544 -s ours am: 8e552b10c7 -s ours am: d75bba0cec -s ours am: 3a3afbd571 -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: I39022a617069a06a317a5496b70b4352816fd822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 00:32:46 +00:00
Yuri Lin
9ed0b1cc6e [automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb" into qt-dev am: 718c21f25e am: b618fee451 -s ours am: fa7e3ae758 -s ours am: a10aa3cc26 -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: Id28c8397cdbb1da5dcb2414a4029b701a57c36a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 23:34:58 +00:00
Julia Reynolds
5f6329c80a [automerger skipped] Fix NPE when deleting old zen rules am: 7bb9cd92bf am: 8a021141ff am: b953b5eff6 -s ours am: 1cb919e374 -s ours 
am skip reason: Merged-In I069fcc124af24227fa50b61d4fc55d6dadc7a20b with SHA-1 93aa03a0db is already in history

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

Change-Id: Iab15f57066387644be45f281e53731bdd8071304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 23:34:30 +00:00
Julia Reynolds
3a3afbd571 [automerger skipped] Store DND rule owners am: eda171cffa am: 1eaa443544 -s ours am: 8e552b10c7 -s ours am: d75bba0cec -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: I7c7301a52eb7d575eead7590f4e3bb8e2580b7ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 23:34:12 +00:00
Yuri Lin
a10aa3cc26 [automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb" into qt-dev am: 718c21f25e am: b618fee451 -s ours am: fa7e3ae758 -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: I7ed464a5f7505f158170c100b9a078e9f426d488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 23:01:29 +00:00
Julia Reynolds
1cb919e374 [automerger skipped] Fix NPE when deleting old zen rules am: 7bb9cd92bf am: 8a021141ff am: b953b5eff6 -s ours 
am skip reason: Merged-In I069fcc124af24227fa50b61d4fc55d6dadc7a20b with SHA-1 93aa03a0db is already in history

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

Change-Id: Iac92362c4a30230920b9803085d67aa9b39a300b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 23:01:17 +00:00
Julia Reynolds
d75bba0cec [automerger skipped] Store DND rule owners am: eda171cffa am: 1eaa443544 -s ours am: 8e552b10c7 -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: Ib5c9cd9eaeb1cb2aa350dff5403a41b88cdf9ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 23:01:01 +00:00
Yuri Lin
fa7e3ae758 [automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb" into qt-dev am: 718c21f25e am: b618fee451 -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: Idd8503674a3bae4d09df32d8668866e3e317af62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 22:21:20 +00:00
Julia Reynolds
b953b5eff6 Fix NPE when deleting old zen rules am: 7bb9cd92bf am: 8a021141ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19202448

Change-Id: I30d2f72da503892d245bbedf27f2395f8640923d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 22:21:02 +00:00
Julia Reynolds
8e552b10c7 [automerger skipped] Store DND rule owners am: eda171cffa am: 1eaa443544 -s ours 
am skip reason: skipped by user yurilin

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

Change-Id: Ic9774cd49158e32f7b4e42b1ee410580e8d8ce86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 22:20:44 +00:00
Yuri Lin
b618fee451 Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb" into qt-dev am: 718c21f25e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19117579

Change-Id: I031700a1b2592e1f647f2e727b26610a1e48268f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:27:02 +00:00
Julia Reynolds
8a021141ff Fix NPE when deleting old zen rules am: 7bb9cd92bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19202448

Change-Id: I5849b48a9a54f52c1bb7a8eafa9595c160577547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:26:51 +00:00
Julia Reynolds
1eaa443544 Store DND rule owners am: eda171cffa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19197499

Change-Id: I9014b79735494dd9ea763ec18490bb2b12b6ecf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:26:47 +00:00
Yuri Lin
4a3ddfafaf [automerger skipped] Merge changes from topic "cherrypick-jr-owner-azffbn1bzv" into rvc-qpr-dev am: 935664ad48 -s ours am: 46eea36112 -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 34f2ef779b is already in history

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

Change-Id: I14d34c2505487cbcea8447bce5b8f4d613b85b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:25:47 +00:00
Yuri Lin
b10b9b6fb0 [automerger skipped] Enforce zen rule limit on a package level. am: 76c78aa2b0 -s ours am: 8d65fed66a -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 34f2ef779b is already in history

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

Change-Id: Ib7d1a9df27258d5a67020da31a624382a1f61729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:25:35 +00:00
TreeHugger Robot
3fd09c6768 [automerger skipped] Merge "switch TelecomManager List getters to ParceledListSlice" into qt-dev am: 8f07d18092 am: 3ff00b522f -s ours am: 276cf3586d -s ours am: d082469151 -s ours am: d8f6ffaa24 -s ours 
am skip reason: skipped by user tjstuart

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

Change-Id: I2ffef2b3f80a2fff0043bff195b593e007424b9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:25:06 +00:00
Thomas Stuart
1ef8802d73 [automerger skipped] Merge "switch TelecomManager List getters to ParceledListSlice" into rvc-dev am: 2f287743a4 am: b680cef434 -s ours am: 3247344939 -s ours 
am skip reason: Merged-In I025245b2a6f8cfaca86f268851a9d8f0817e07dd with SHA-1 d54a48f42a is already in history

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

Change-Id: I8ff4b30f52126e0ebe483c6bd788f3e4af357700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 21:24:35 +00:00
Yuri Lin
46eea36112 [automerger skipped] Merge changes from topic "cherrypick-jr-owner-azffbn1bzv" into rvc-qpr-dev am: 935664ad48 -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 34f2ef779b is already in history

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

Change-Id: I10f316020111bbff688153e6e11866f1c72cabe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 20:54:01 +00:00
Yuri Lin
8d65fed66a [automerger skipped] Enforce zen rule limit on a package level. am: 76c78aa2b0 -s ours 
am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 34f2ef779b is already in history

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

Change-Id: I61ce6fcc0527df7035642227b55af8c3b5e3b752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 20:53:46 +00:00
TreeHugger Robot
d8f6ffaa24 [automerger skipped] Merge "switch TelecomManager List getters to ParceledListSlice" into qt-dev am: 8f07d18092 am: 3ff00b522f -s ours am: 276cf3586d -s ours am: d082469151 -s ours 
am skip reason: skipped by user tjstuart

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

Change-Id: I4ab3091bb0a561d77ca91688ee55eee0e81aeb2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 20:52:10 +00:00
Thomas Stuart
3247344939 [automerger skipped] Merge "switch TelecomManager List getters to ParceledListSlice" into rvc-dev am: 2f287743a4 am: b680cef434 -s ours 
am skip reason: Merged-In I025245b2a6f8cfaca86f268851a9d8f0817e07dd with SHA-1 d54a48f42a is already in history

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

Change-Id: I8e133bce4302af314459f6df0e4ff4b520552fb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 20:51:39 +00:00
Yuri Lin
718c21f25e Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb" into qt-dev 
* changes:
  Enforce zen rule limit on a package level.
  Fix NPE when deleting old zen rules
  Store DND rule owners
 2022-08-10 20:51:29 +00:00
Yuri Lin
935664ad48 Merge changes from topic "cherrypick-jr-owner-azffbn1bzv" into rvc-qpr-dev 
* changes:
  Enforce zen rule limit on a package level.
  Fix NPE when deleting old zen rules
  Store DND rule owners
 2022-08-10 20:50:40 +00:00
Yuri Lin
477b38dd3c Merge "Enforce zen rule limit on a package level." into sc-dev am: bbc3447e3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19117575

Change-Id: I9dd2f519bd7de90b1bc38254dc21a8155ab47960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 20:18:18 +00:00
TreeHugger Robot
d082469151 [automerger skipped] Merge "switch TelecomManager List getters to ParceledListSlice" into qt-dev am: 8f07d18092 am: 3ff00b522f -s ours am: 276cf3586d -s ours 
am skip reason: skipped by user tjstuart

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

Change-Id: Id8aa0e70d712ad381347879968ef590527d6e9bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 20:10:44 +00:00
Thomas Stuart
b680cef434 Merge "switch TelecomManager List getters to ParceledListSlice" into rvc-dev am: 2f287743a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19322229

Change-Id: I3751af9dda8a9b79d433bf23dc6bf6997aa5a5fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 20:10:22 +00:00
TreeHugger Robot
276cf3586d [automerger skipped] Merge "switch TelecomManager List getters to ParceledListSlice" into qt-dev am: 8f07d18092 am: 3ff00b522f -s ours 
am skip reason: skipped by user tjstuart

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

Change-Id: Ie8f4ed29b1dae5a031e971a27009cf052e067d0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 19:53:28 +00:00