Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
499,862 Commits 3 Branches 0 Tags
d1ec350fffc5e7ae7c8d40084fe2f6dc42380ca4
Commit Graph

499862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
d1ec350fff [automerger skipped] Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into qt-dev am: a2e320eebf am: a3e4075b98 -s ours am: 14f6682d6c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib4a993d094891a75dfa90273312db7e10da44188
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-29 01:40:53 +00:00
Matt Pietal
00ab92d015 [automerger skipped] [DO NOT MERGE] Keyguard - Treat messsages to lock with priority am: 82c01c46ad am: 013f20d89c -s ours am: c5c52c2363 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8165e03b4f3cbbce613ff25ff43aeac71e0771f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-29 01:40:31 +00:00
TreeHugger Robot
14f6682d6c [automerger skipped] Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into qt-dev am: a2e320eebf am: a3e4075b98 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia5fc30c9c0d0eac69fe8fa296b12376db949e48b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-29 00:40:40 +00:00
Matt Pietal
c5c52c2363 [automerger skipped] [DO NOT MERGE] Keyguard - Treat messsages to lock with priority am: 82c01c46ad am: 013f20d89c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8b7cac28022c6875c87de8b203bd37fc3f92bef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-29 00:40:08 +00:00
TreeHugger Robot
a3e4075b98 Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into qt-dev am: a2e320eebf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16852007

Change-Id: Ibd98047694081bb42f6dc5a7121ce65901c05399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-28 23:38:37 +00:00
Matt Pietal
013f20d89c [DO NOT MERGE] Keyguard - Treat messsages to lock with priority am: 82c01c46ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16852007

Change-Id: I6175592d64c7a9aa902cb480a2943d40a7845cfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-28 23:38:14 +00:00
TreeHugger Robot
a2e320eebf Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into qt-dev 2022-11-28 22:55:00 +00:00
Matt Pietal
493f00624f Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into rvc-qpr-dev 2022-11-28 13:42:02 +00:00
Jing Ji
07010d6514 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into qt-dev am: 8274886238 am: 72967ce869 -s ours am: f90ec68dfa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I625ad72239921ee99824abffd900c67f0d970e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 23:50:37 +00:00
Jing Ji
8ddb18fb3e [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 2d20bee73d am: 0c4ae95734 -s ours am: b899c83312 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I584fd6edff8e35d805606db374b2145855514047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 23:50:21 +00:00
Jing Ji
f90ec68dfa [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into qt-dev am: 8274886238 am: 72967ce869 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id94acb14dc5215f5554cc948a9f131e9d284a759
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 23:21:38 +00:00
Jing Ji
b899c83312 [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 2d20bee73d am: 0c4ae95734 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf468a8bb485b2492f464be0a094a65bbdbdea8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 23:21:04 +00:00
Jing Ji
72967ce869 Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into qt-dev am: 8274886238 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20283592

Change-Id: I00e1b07a3f5031661fa04732b79aa30fdaa1da1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:44:55 +00:00
Jing Ji
0c4ae95734 DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 2d20bee73d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20283592

Change-Id: I37245593a4a8b7c0f5225d38bdb3054d883a6bb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:44:45 +00:00
Jing Ji
b1003d47de Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-dev am: ca7d20c52e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20308700

Change-Id: I7a836e1526668623fd19b6b23534eae270252df5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:25:56 +00:00
Jing Ji
42c14393e6 DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 8c90891a38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20308700

Change-Id: If2c17dd1a5d80952dd61e3b58cf4eaf18f4ee70d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:25:41 +00:00
Jing Ji
8274886238 Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into qt-dev 2022-11-14 22:11:13 +00:00
Jing Ji
ca7d20c52e Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-dev 2022-11-14 21:28:19 +00:00
Matt Pietal
51c5dae6bb [DO NOT MERGE] Keyguard - Treat messsages to lock with priority 
When switching users and attempting to lock the device, the sysui main
thread becomes overwhelmed with events, creating a significant lag
between the time a message is posted and processed on the main
thread. This can be dangerous when these events are critical for
security, such as calls coming from PhoneWindowManager#lockNow() that
call KeyguardViewMediator#doKeyguardTimeout(). On older devices with
slower CPUs and less memory, the delay in processing can be
significant (15 - 30s).

The result of not prioritizing these events leads to a window of time
where a guest user can switch back to the owner, and gain access to
the owner's homescreen without needing to unlock the device with the
owner's credentials.

As a mitigation, prioritize two events originating in two specific
methods to make sure the device locks as soon as possible as well as
have the system server preemptively update its local cache.

Bug: 151095871
Test: Very manual race condition - follow steps listed in bug
Change-Id: I7585a0a5eeb308e0e32a4f77f581556d883b5cda
Merged-In: I7585a0a5eeb308e0e32a4f77f581556d883b5cda
(cherry picked from commit 28c53ab8bc)
(cherry picked from commit 21e48cf26b)
 2022-11-11 13:57:32 +00:00
Rhed Jao
cd8ca0377a Merge "DO NOT MERGE Apply a maximum char count to the load label api" into rvc-qpr-dev 2022-11-10 04:45:36 +00:00
Jackal Guo
90638d62d1 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into qt-dev am: efd2f4cdcb am: 9e9dcb3da2 -s ours am: aab929d14a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I63193ee5b9be2983fa9a1291a83ac16cdc8bcd35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 03:02:40 +00:00
Jackal Guo
586eb03a2f [automerger skipped] [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED am: 8b2e092146 am: 0b7ea025f1 -s ours am: ccd922ec12 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d16a0d6ae41d461d9831202e4769b406aba9594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 03:02:24 +00:00
Jackal Guo
aab929d14a [automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into qt-dev am: efd2f4cdcb am: 9e9dcb3da2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I26ea72c8bbeba5e15a1542d612796e97f61cd358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 02:32:05 +00:00
Jackal Guo
ccd922ec12 [automerger skipped] [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED am: 8b2e092146 am: 0b7ea025f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I51d93b2d704d83d5ce49a7360b99a2fe6f159978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 02:31:40 +00:00
Jackal Guo
9e9dcb3da2 Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into qt-dev am: efd2f4cdcb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20307961

Change-Id: I26e6b3bafc1b5570c53cec106b8a6a1b7be7a637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 01:49:53 +00:00
Jackal Guo
0b7ea025f1 [RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED am: 8b2e092146 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20307961

Change-Id: I43974ab516b22f9b2ca3bc1c6966f35fe1a7b139
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 01:49:48 +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
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
132dc2f9db Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into rvc-dev 2022-11-10 01:19:24 +00:00
Jackal Guo
efd2f4cdcb Merge "[RESTRICT AUTOMERGE] Correct the behavior of ACTION_PACKAGE_DATA_CLEARED" into qt-dev 2022-11-10 01:19:19 +00:00
Yuri Lin
ea7cb4db90 [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 skip reason: subject contains skip directive

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

Change-Id: I21f18405664aafc4a44360280cae8bc538434b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 21:29:44 +00:00
Yuri Lin
85d658cc5a [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 skip reason: subject contains skip directive

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

Change-Id: I9733c486c3950dc0cdcc09f307274ef90e1bc02d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 21:29:41 +00:00
Yuri Lin
b74d0aa220 [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 skip reason: subject contains skip directive

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

Change-Id: Icffdb66e98b122084f307610a004b9958ac5a598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 21:29:23 +00:00
Yuri Lin
c97d507be7 [automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: d8d16111a1 am: 6381a6192f -s ours am: 608586c08a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4de804082cb1486f6e362bc3990f5fd73af0afaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 21:29:06 +00:00
Yuri Lin
71bfa22c30 [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 skip reason: subject contains skip directive

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

Change-Id: Ib22a389591022cde40014d13d2c59ac1e5d8e9a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 20:59:06 +00:00
Yuri Lin
ee98ca9b78 [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 skip reason: subject contains skip directive

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

Change-Id: I377a8aacebd996e112ef4feedade8b2666172d52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 20:59:01 +00:00
Yuri Lin
349169cfc1 [automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into qt-dev am: 0852b61db1 am: 74525f50a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4bd5d6387f70cb7b73160b305f1079e56ef7302c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 20:58:40 +00:00
Yuri Lin
608586c08a [automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: d8d16111a1 am: 6381a6192f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a7abedc72f47293064e756cb299c5588d60ae12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 20:58:18 +00:00
Yuri Lin
4278c4fff8 Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into qt-dev am: 020e76f630 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20406267

Change-Id: I96663e3a9f2feab601a1681ae793e8013ad14d5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 20:34:49 +00:00
Yuri Lin
aa82e1c91c [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 7fcdd1fa0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20406267

Change-Id: I66835da3b4dfce009a208fc20f2b4369e280b4fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 20:34:47 +00:00
Yuri Lin
74525f50a7 Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into qt-dev am: 0852b61db1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20404106

Change-Id: Iffe69bf8b801755f1d141c5bbd63d6916868c17d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 20:34:37 +00:00
Yuri Lin
6381a6192f [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: d8d16111a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20404106

Change-Id: I56aff8639a058af88dff6a3dc84334c8e80d5267
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 20:34:34 +00:00
Yuri Lin
88e833e696 [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 skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 2ceaaebb3c is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I592cb9a7f62ebf8501cfa6aee975784f41dff6f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 20:30:05 +00:00
Yuri Lin
5293d5277d [automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 8de098ee2f -s ours 
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 2ceaaebb3c is already in history. Merged-In was found from reverted change.

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

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

Change-Id: If6aedf95a8af49c5abbc4cfb93992c35a864c80d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 20:30:01 +00:00
Yuri Lin
68af017762 [automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into rvc-dev am: 651383dda6 -s ours 
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 df439a438f is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I89c80f7c5948f9ccfdc49999bdae8f6c81f62b8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 20:29:55 +00:00
Yuri Lin
696c53ab13 [automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: 2643890445 -s ours 
am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 df439a438f is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I899a01362c8a43a78786a77e6f516dc13eaddab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 20:29:52 +00:00
Yuri Lin
543b401329 Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into rvc-qpr-dev 2022-11-08 20:09:29 +00:00
Yuri Lin
aad71ae8d8 Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into rvc-qpr-dev 2022-11-08 20:09:29 +00:00
Yuri Lin
da89ac7e3c Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into rvc-dev 2022-11-08 20:09:17 +00:00
Yuri Lin
651383dda6 Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into rvc-dev 2022-11-08 20:09:17 +00:00