Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
769,376 Commits 3 Branches 0 Tags
ed332b2be20436dc9f59c56c102f5061471c4e6e
Commit Graph

769376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jackal Guo
ed332b2be2 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into rvc-dev am: 132dc2f9db am: 377ac368c1 -s ours am: 08b5b89ac1 -s ours am: bdafbc4faf -s ours am: f9704bf782 -s ours am: e41d60c1b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifd6999c4d3611f181fa7eae6dc63f16060fe1fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 09:06:11 +00:00
Jackal Guo
5ebae447f3 [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 skip reason: subject contains skip directive

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

Change-Id: Id37af005e60e5dbf75a10496b126b0369d4d01c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 09:05:57 +00:00
Jackal Guo
e41d60c1b9 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into rvc-dev am: 132dc2f9db am: 377ac368c1 -s ours am: 08b5b89ac1 -s ours am: bdafbc4faf -s ours am: f9704bf782 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b8ccf0e0474e4809390b4a5954cf636a7f32e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 08:33:31 +00:00
Jackal Guo
5bdc3c5123 [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 skip reason: subject contains skip directive

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

Change-Id: Ie537f739eb5eb5343560176a71bcd2ad32a3473d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 08:32:56 +00:00
Jackal Guo
f9704bf782 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into rvc-dev am: 132dc2f9db am: 377ac368c1 -s ours am: 08b5b89ac1 -s ours am: bdafbc4faf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I96e9a36f4835f05a950d568c031aa44c82a8e6da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 08:04:16 +00:00
Jackal Guo
ae1636ca8c [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 skip reason: subject contains skip directive

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

Change-Id: Idfa5311b0eaae82b588051bf330921c772e78f76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 08:04:12 +00:00
Jackal Guo
bdafbc4faf [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into rvc-dev am: 132dc2f9db am: 377ac368c1 -s ours am: 08b5b89ac1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I02bd31d867dc8464c3b86a6f71ffcff6394d322b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 03:03:32 +00:00
Jackal Guo
a17da6d6ef [automerger skipped] [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED am: 0587cd294a am: 41d97a7879 -s ours am: 579d098add -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0e92c93a5c80e29e9e28019425247b007a42bc5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 03:03:22 +00:00
Jackal Guo
16e1f7af7e [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 skip reason: subject contains skip directive

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

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

Change-Id: I1c8977cc72e59a1f93e15be23f9c0a94b0fc73e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 02:34:44 +00:00
Jackal Guo
19fcdefc96 [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 skip reason: subject contains skip directive

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

Change-Id: I7a62b4e1cbdd25c23e14813a2b704657f91070a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 02:34:42 +00:00
Jackal Guo
08b5b89ac1 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into rvc-dev am: 132dc2f9db am: 377ac368c1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I17d3f8ae052b34fa25edf7cb3d4e326df9833228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 02:33:54 +00:00
Jackal Guo
579d098add [automerger skipped] [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED am: 0587cd294a am: 41d97a7879 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4bbb37b59256cfeb0c2fc47c254bea9f79af010b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 02:33:34 +00:00
Jackal Guo
217c0dceda [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 skip reason: subject contains skip directive

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

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

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

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

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

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

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

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

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

Change-Id: I1b1c8dc109381c69f236e17f0df26323ef8712d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 01:51:17 +00:00
Jackal Guo
37414d9a6f [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 skip reason: subject contains skip directive

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

Change-Id: I6465c3ee91290a99c430180608e4dd2bab8960e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 01:51:02 +00:00
Jackal Guo
cbac6147b4 [automerger skipped] [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED am: 9baf03004b -s ours am: 25d21addaf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I556d324013938f245c399eaae0d6c4eb1f050a5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 01:51:00 +00:00
Jackal Guo
d4146a52e0 Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into tm-dev am: 55c6e878ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20302522

Change-Id: I67d6fac5b040597eeeb724c2d7d8824336a716f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 01:50:49 +00:00
Jackal Guo
1a9eb9092b [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED am: 94b10bba20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20302522

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

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

Change-Id: Iabe2528f5bca7915cf6c99789dd2881523f5196c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 01:48:02 +00:00
Jackal Guo
377ac368c1 Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into rvc-dev am: 132dc2f9db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20307962

Change-Id: I659da49682a68995399d0b13873199b4cc61bb11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 01:47:39 +00:00
Jackal Guo
2a561ed624 Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into sc-dev am: 2f4226e5cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20302364

Change-Id: I6a2cad32d6af0ffe098b73ed4818cb4522808b80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 01:47:33 +00:00
Jackal Guo
41d97a7879 [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED am: 0587cd294a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20307962

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

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

Change-Id: Ifd792e08f025ad48d38953c11e1a5fd5a8729eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 01:47:19 +00:00
Jackal Guo
55c6e878ab Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into tm-dev 2022-11-10 01:19:33 +00:00
Jackal Guo
a74b09c26b Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into sc-v2-dev 2022-11-10 01:19:30 +00:00
Jackal Guo
2f4226e5cb Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into sc-dev 2022-11-10 01:19:28 +00:00
Jackal Guo
e531ea8f9c Merge changes from topic "presubmit-am-37de191e8f264fc2890d1cc94278eaff" into sc-qpr1-dev 
* changes:
  [automerge] [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED 2p: 1748c4e356
  [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED
 2022-11-10 01:19:27 +00:00
Jackal Guo
132dc2f9db Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into rvc-dev 2022-11-10 01:19:24 +00:00
Fabian Kozynski
a5ae99522c [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 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: I80f51ee9c7d51595ee81707d9bc73b25cd8d26ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-09 22:23:32 +00:00
Fabian Kozynski
7a310edfd6 [automerger skipped] Disable click on privacy chip before provision am: bf4d73f6ba -s ours am: a711b14239 -s ours am: 0e5a93edaa -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: I4bb3ddab0caf67985906718a36e7ec1abb2d0d35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-09 22:23:21 +00:00
Fabian Kozynski
3001331cd7 [automerger skipped] Merge "Disable click on privacy chip before provision" into sc-qpr1-dev am: 40665a799a -s ours am: 5398a2e587 -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: Idf592b9d10949137d8411c15de77ac13a92eadff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-09 21:36:04 +00:00
Fabian Kozynski
0e5a93edaa [automerger skipped] Disable click on privacy chip before provision am: bf4d73f6ba -s ours am: a711b14239 -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: Iccfaa4e2abb037ee9e12830375ac4557a3acc1da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-09 21:35:28 +00:00
Fabian Kozynski
5398a2e587 [automerger skipped] Merge "Disable click on privacy chip before provision" into sc-qpr1-dev am: 40665a799a -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: I296d25713664f7ea84e5f2b7657e106e91bfb233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-09 20:54:23 +00:00
Fabian Kozynski
a711b14239 [automerger skipped] Disable click on privacy chip before provision am: bf4d73f6ba -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: Ic7e0ef8e3fd999cd6b2e6b3c1af6efb75f9e5ea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-09 20:54:03 +00:00
Fabian Kozynski
40665a799a Merge "Disable click on privacy chip before provision" into sc-qpr1-dev 2022-11-09 20:08:04 +00:00
Yuri Lin
f78f6c1d02 [automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into tm-dev am: e80f89c294 -s ours 
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 6b38e11635 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Ifddd532a30d1b5a95c6cf1159734f75409c3e7d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-09 19:41:15 +00:00
Yuri Lin
021541b2f0 [automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: e801502368 -s ours 
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 6b38e11635 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I4b23307349c3331fea35b37e25df64937c980221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-09 19:41:00 +00:00
Yuri Lin
5a289d4b3e [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 skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 d9ead5f42c is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I8c4fc509333dd2e5365717d7e0e0e210831edaf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-09 19:40:55 +00:00
Yuri Lin
6e22fdc7af [automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: ebbcea2701 -s ours 
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 d9ead5f42c is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Iad3ecbc073bf977cbb78484ea30e60bedb3ce4c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-09 19:40:50 +00:00
Yuri Lin
e80f89c294 Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into tm-dev 2022-11-09 19:11:12 +00:00
Yuri Lin
b1ace5c498 Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into tm-dev 2022-11-09 19:11:12 +00:00
Fabian Kozynski
bf4d73f6ba Disable click on privacy chip before provision 
Test: atest QuickStatusBarHeaderControllerTest
Bug: 253043058
Change-Id: I8099dfd259b149cd18509677d623de7a352f5de0
Merged-In: I9c8f642976f3332f4d5c9db89a4917dae501f251
 2022-11-09 18:05:53 +00:00
Fabian Kozynski
cd5c3bb95a Merge "Disallow clicks on privacy chip before provisioned" into tm-dev am: d19f3a7862 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20327583

Change-Id: Iab0844573a7e57d90f68affaf4bac7e0240564b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-09 16:53:46 +00:00
Fabian Kozynski
d19f3a7862 Merge "Disallow clicks on privacy chip before provisioned" into tm-dev 2022-11-09 16:19:29 +00:00
Yuri Lin
67fea8eb64 [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 skip reason: subject contains skip directive

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

Change-Id: I339186c2fcb399ab929429830478c7563935dd8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-09 00:18:53 +00:00