Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
649,794 Commits 3 Branches 0 Tags
151d75d3e85fd892a15680e20f3be3487ec5e040
Commit Graph

649794 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Songchun Fan
151d75d3e8 [automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours 
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 fcdc62081c is already in history

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

Change-Id: I2054a77b1a5c7dbf4260bcf73c222e5a4a4f027b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 19:51:16 +00:00
Daniel Norman
18628f192f Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423

Change-Id: I7c652c1b5920bd5a226ec4f987f4d38dbbc60f1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 19:50:57 +00:00
TreeHugger Robot
97f625773a [automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb1042bd57bb1d0f8d8a4a4d0eaaea412e75a5d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 19:50:30 +00:00
Matt Pietal
9b928f8140 [automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f682aaf487e0f082d4b8dfe6159305b84360a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 19:48:52 +00:00
Songchun Fan
526af0d1b1 [automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours 
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 fcdc62081c is already in history

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

Change-Id: I7e3dcae19c8112d932490408fbab4eb36045d5e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 19:21:30 +00:00
Daniel Norman
73089d0c3a Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423

Change-Id: I9f9dca5eccac9bc82357e1322b3d3534a86e6ac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 19:21:10 +00:00
TreeHugger Robot
b7075acb14 [automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec721bc5e1d9fbb52634ba16f4d055e253e61f1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 19:20:16 +00:00
Matt Pietal
898d578fa1 [automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0010ea681d0f41e96d0143678e07d5727b4aed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 19:19:43 +00:00
Songchun Fan
478c97e58c [automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours 
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 fcdc62081c is already in history

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

Change-Id: Id059621a771490861b3fd4fa491a6dd338e14b81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 18:43:49 +00:00
Daniel Norman
10c659e317 Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423

Change-Id: I7e0febed51091e07af6be4157d081c837a719589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 18:43:22 +00:00
TreeHugger Robot
5ddcc96b01 [automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08835ffbb0ab13ba76c47bfe0e2d1d3d7a5788ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 18:42:38 +00:00
Matt Pietal
d17cc27210 [automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie62c1837d7eb8bdb25c51ec2d797bcda4b958ae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 18:41:36 +00:00
Songchun Fan
ae7a1df57d Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19935572

Change-Id: Ic0c235c82f13e4e8f09b35bb9f30134cfcf8617e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 18:19:25 +00:00
Daniel Norman
7588fa6866 Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423

Change-Id: Ia708dba5893575578ae7a383dd823a3726b5aab4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 18:18:04 +00:00
TreeHugger Robot
f3c6684b16 Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859

Change-Id: I6ea11a78ee30c911dee0fe1e71b1bfb422751951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 18:17:30 +00:00
Matt Pietal
02b525316e [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859

Change-Id: Ie85c312ad47c5be276010f0a96d64e058be2fbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 13:46:09 +00:00
Songchun Fan
0511109afb [automerger skipped] Merge "[pm] forbid deletion of protected packages" into rvc-dev am: 74592430e2 -s ours am: 98ba0a3f7a -s ours 
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 538654167a is already in history

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

Change-Id: I4eb3103f621f6c9f151db80f31c971861b8ec888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-15 22:50:38 +00:00
Songchun Fan
3eac291ad0 [automerger skipped] [pm] forbid deletion of protected packages am: fcdc62081c -s ours am: 1827bc2be5 -s ours 
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 538654167a is already in history

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

Change-Id: I6fccc5324ad0ff34bd16022690bf736fd6df4568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-15 22:50:31 +00:00
Songchun Fan
467fe36031 [automerger skipped] Merge "[pm] forbid deletion of protected packages" into rvc-qpr-dev am: 61ec81ae9b -s ours 
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 dba7ceb57e is already in history

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

Change-Id: I795b9a22bb64f6d924fd14c6945b7b7c25cc5b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-15 22:50:16 +00:00
Songchun Fan
b4f0e16953 [automerger skipped] [pm] forbid deletion of protected packages am: 538654167a -s ours 
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 dba7ceb57e is already in history

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

Change-Id: I45d747a757e235d29ba1a331fce39704b086b2f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-15 22:50:01 +00:00
Songchun Fan
98ba0a3f7a [automerger skipped] Merge "[pm] forbid deletion of protected packages" into rvc-dev am: 74592430e2 -s ours 
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 538654167a is already in history

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

Change-Id: I644f3df5600dfc08c7dfd9e8ae306594b1e786e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-15 22:48:44 +00:00
Songchun Fan
1827bc2be5 [automerger skipped] [pm] forbid deletion of protected packages am: fcdc62081c -s ours 
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 538654167a is already in history

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

Change-Id: Ibfd47d9145701da8f082935c8e9cb963c7c0ec67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-15 22:48:28 +00:00
Songchun Fan
74592430e2 Merge "[pm] forbid deletion of protected packages" into rvc-dev 2022-09-15 22:17:49 +00:00
Songchun Fan
61ec81ae9b Merge "[pm] forbid deletion of protected packages" into rvc-qpr-dev 2022-09-15 22:17:38 +00:00
Songchun Fan
b2abf2632c Merge "[pm] forbid deletion of protected packages" into sc-dev 2022-09-15 22:17:17 +00:00
Songchun Fan
b625b562c4 Merge "[pm] forbid deletion of protected packages" into qt-dev 2022-09-15 20:58:34 +00:00
Matt Pietal
d1afd041a1 Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into sc-dev 2022-09-15 17:45:36 +00:00
Matt Pietal
13ac3a30cc [automerger skipped] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: c27cf661a6 am: 2ebce335cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id78dd57dede71747a52ff0262ea301dbaf795698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-15 17:37:52 +00:00
Matt Pietal
2ebce335cc [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: c27cf661a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952027

Change-Id: Ibfa084ca6af6c1b06f93b99bf9db1ef1ffa76d29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-15 17:08:54 +00:00
Daniel Norman
6505ed1695 Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev 2022-09-15 16:43:41 +00:00
TreeHugger Robot
c184d7b721 Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev 2022-09-15 16:39:42 +00:00
Matt Pietal
c27cf661a6 [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock 
After PUK unlock, multiple calls to
KeyguardSecurityContainerController#dismiss() were being called from
the KeyguardSimPukViewController, which begins the transition to the
next security screen, if any. At the same time, other parts of the
system, also listening to SIM events, recognize the PUK unlock and
call KeyguardSecurityContainer#showSecurityScreen, which updates which
security method comes next. After boot, this should be one of PIN,
Password, Pattern, assuming they have a security method. If one of the
first dismiss() calls comes AFTER the security method changes, this is
incorrectly recognized by the code as a successful
PIN/pattern/password unlock. This causes the keyguard to be marked as
done, causing screen flickers and incorrect system state.

The solution: every call to dismiss() should include a new parameter
for the security method used. If there is a difference between this
parameter and the current value in KeyguardSecurityContainerCallback,
ignore the request, as the system state has changed.

Bug: 218500036
Test: atest KeyguardSecurityContainerTest

Merged-In: I7c8714a177bc85fbce92f6e8fe911f74ca2ac243
Change-Id: I30226bc7b5eda9480d471b35fe81e106b0491ff8
 2022-09-15 11:48:17 +00:00
Matt Pietal
1e7087f113 [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock 
After PUK unlock, multiple calls to
KeyguardSecurityContainerController#dismiss() were being called from
the KeyguardSimPukViewController, which begins the transition to the
next security screen, if any. At the same time, other parts of the
system, also listening to SIM events, recognize the PUK unlock and
call KeyguardSecurityContainer#showSecurityScreen, which updates which
security method comes next. After boot, this should be one of PIN,
Password, Pattern, assuming they have a security method. If one of the
first dismiss() calls comes AFTER the security method changes, this is
incorrectly recognized by the code as a successful
PIN/pattern/password unlock. This causes the keyguard to be marked as
done, causing screen flickers and incorrect system state.

The solution: every call to dismiss() should include a new parameter
for the security method used. If there is a difference between this
parameter and the current value in KeyguardSecurityContainerCallback,
ignore the request, as the system state has changed.

Fixes: 238804980
Bug: 218500036
Test: atest KeyguardSecurityContainerTest
AdminSecondaryLockScreenControllerTest KeyguardHostViewControllerTest
KeyguardSecurityContainerControllerTest

Change-Id: I7c8714a177bc85fbce92f6e8fe911f74ca2ac243
Merged-In: I7c8714a177bc85fbce92f6e8fe911f74ca2ac243
(cherry picked from commit 37aeb26b0a)
 2022-09-14 15:00:11 +00:00
Matt Pietal
a30148b8a4 [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock 
After PUK unlock, multiple calls to
KeyguardSecurityContainerController#dismiss() were being called from
the KeyguardSimPukViewController, which begins the transition to the
next security screen, if any. At the same time, other parts of the
system, also listening to SIM events, recognize the PUK unlock and
call KeyguardSecurityContainer#showSecurityScreen, which updates which
security method comes next. After boot, this should be one of PIN,
Password, Pattern, assuming they have a security method. If one of the
first dismiss() calls comes AFTER the security method changes, this is
incorrectly recognized by the code as a successful
PIN/pattern/password unlock. This causes the keyguard to be marked as
done, causing screen flickers and incorrect system state.

The solution: every call to dismiss() should include a new parameter
for the security method used. If there is a difference between this
parameter and the current value in KeyguardSecurityContainerCallback,
ignore the request, as the system state has changed.

Bug: 218500036
Test: atest KeyguardSecurityContainerTest

Merged-In: I7c8714a177bc85fbce92f6e8fe911f74ca2ac243
Change-Id: I30226bc7b5eda9480d471b35fe81e106b0491ff8
 2022-09-14 14:49:28 +00:00
Songchun Fan
dba7ceb57e [pm] forbid deletion of protected packages 
BUG: 242996180
Test: adb shell pm uninstall --user 0 com.google.android.apps.work.oobconfig
Test: Verified with the command above. Before this CL, the package can
be deleted. After this CL, the deletion will fail.

Change-Id: Iba408e536b340ea5d66ab499442c0c4f828fa36f
(cherry picked from commit 15f85c7fa9)
Merged-In: Iba408e536b340ea5d66ab499442c0c4f828fa36f
 2022-09-13 18:08:24 +00:00
Songchun Fan
538654167a [pm] forbid deletion of protected packages 
BUG: 242996180
Test: adb shell pm uninstall --user 0 com.google.android.apps.work.oobconfig
Test: Verified with the command above. Before this CL, the package can
be deleted. After this CL, the deletion will fail.

Change-Id: Iba408e536b340ea5d66ab499442c0c4f828fa36f
(cherry picked from commit 15f85c7fa9)
Merged-In: Iba408e536b340ea5d66ab499442c0c4f828fa36f
 2022-09-13 18:07:53 +00:00
Songchun Fan
fcdc62081c [pm] forbid deletion of protected packages 
BUG: 242996180
Test: adb shell pm uninstall --user 0 com.google.android.apps.work.oobconfig
Test: Verified with the command above. Before this CL, the package can
be deleted. After this CL, the deletion will fail.

Change-Id: Iba408e536b340ea5d66ab499442c0c4f828fa36f
(cherry picked from commit 15f85c7fa9)
Merged-In: Iba408e536b340ea5d66ab499442c0c4f828fa36f
 2022-09-13 18:06:07 +00:00
Songchun Fan
2e42c393f2 [pm] forbid deletion of protected packages 
BUG: 242996180
Test: adb shell pm uninstall --user 0 com.google.android.apps.work.oobconfig
Test: Verified with the command above. Before this CL, the package can
be deleted. After this CL, the deletion will fail.

Change-Id: Iba408e536b340ea5d66ab499442c0c4f828fa36f
(cherry picked from commit 15f85c7fa9)
Merged-In: Iba408e536b340ea5d66ab499442c0c4f828fa36f
 2022-09-12 17:26:02 -07:00
Iván Budnik
07afb47507 [automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into rvc-dev am: f8f07e22f1 am: b243407293 -s ours 
am skip reason: Merged-In Ibabff26c5a54e89c5dbe3a577f4c7739be6e2709 with SHA-1 8b7cf1993c is already in history

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

Change-Id: I6dbc01fcbe81e6542f1dceac50dc887fe500b17a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 20:24:25 +00:00
Iván Budnik
b243407293 Merge "Revert "Enforce ComponentName belongs to caller app"" into rvc-dev am: f8f07e22f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19781337

Change-Id: Ib19add857ac741684ba902dcad62b423949618b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 19:56:47 +00:00
Iván Budnik
f8f07e22f1 Merge "Revert "Enforce ComponentName belongs to caller app"" into rvc-dev 2022-09-12 18:45:04 +00:00
Iván Budnik
094e9f8046 Revert "Enforce ComponentName belongs to caller app" 
This reverts commit ff7be9912f.

Reason for revert: b/241798893. Note: this fix is not the root cause of the breakage. It just exposes a previously unknown bug. See linked bug.

Change-Id: I7da45dfedace793085da06697976d189e8e7fbdb
Merged-In: Ibabff26c5a54e89c5dbe3a577f4c7739be6e2709
 2022-09-09 16:30:46 +00:00
Iván Budnik
c59352ed18 Merge "Revert "Enforce ComponentName belongs to caller app"" into sc-dev 2022-09-09 16:17:34 +00:00
Evan Severson
3f015cbc5e Merge "Make sure parallel broadcasts enforce excluded permissions" into sc-dev 2022-09-09 04:31:40 +00:00
Yuri Lin
c73ff23f81 [automerger skipped] Merge "Fix system zen rules by using owner package name if caller is system" into qt-dev am: 3fe8fdc4dc am: 85d0cb310c -s ours am: 4bc4a7d756 -s ours am: 5725377e5c -s ours 
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 0b262d0ae5 is already in history

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

Change-Id: I61942631d94f9562fcd8209adf9a5c4cc45894e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:05:44 +00:00
Yuri Lin
697d4897cf [automerger skipped] Merge "Fix system zen rules by using owner package name if caller is system" into rvc-dev am: 06377249c0 -s ours am: b6ae840c5d -s ours 
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 2ceaaebb3c is already in history

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

Change-Id: I23f904413848a16cafe6ddeeb865b107bbbdd30c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:05:29 +00:00
Yuri Lin
d38cce80f9 [automerger skipped] Fix system zen rules by using owner package name if caller is system am: 0b262d0ae5 -s ours am: cb57bce342 -s ours 
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 2ceaaebb3c is already in history

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

Change-Id: Ic1e3d56f2afaeabe9ce781b8ac17650afd3666e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:05:22 +00:00
Yuri Lin
dcbabe5a88 [automerger skipped] Merge "Fix system zen rules by using owner package name if caller is system" into rvc-qpr-dev am: e3434b5548 -s ours 
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 78245566a2 is already in history

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

Change-Id: Ifc88471ab0551788225e6b6941b731bd3906c3d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:04:59 +00:00
Yuri Lin
e0a4c485a3 [automerger skipped] Fix system zen rules by using owner package name if caller is system am: 2ceaaebb3c -s ours 
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 78245566a2 is already in history

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

Change-Id: I4a627fd5bda0e9585927cbfd1aa4302540527e18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:04:46 +00:00
TreeHugger Robot
e67265edf2 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Check permission for VoiceInteraction" into qt-dev am: cef7f19369 am: 14246ca9b8 -s ours am: 3a946e8c95 -s ours am: 4be854db74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4e4a99b04b761e2850186b5e7047bef692187b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:04:21 +00:00