Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
651,851 Commits 3 Branches 0 Tags
605261cc55ae5b517b567b9b6d08d95ea46f549d
Commit Graph

651851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
605261cc55 [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: 97f625773a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e480083cb68d0b77deac3231d96586b8ad29115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 20:18:17 +00:00
Matt Pietal
e855f9c3b3 [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: 9b928f8140 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic54f6aa3bc3fa724a21b53628a8c9ba88c622a18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-19 20:17:51 +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
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
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
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
9d000dcf5f [automerger skipped] Merge "[pm] forbid deletion of protected packages" into rvc-dev am: 74592430e2 -s ours am: 98ba0a3f7a -s ours am: 0511109afb -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: I647ca1616a27bdb00e4085feffc24f1e391fb884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-15 22:52:03 +00:00
Songchun Fan
08d869134c [automerger skipped] [pm] forbid deletion of protected packages am: fcdc62081c -s ours am: 1827bc2be5 -s ours am: 3eac291ad0 -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: I4d21e8b1194e67c04e7b376d780546e89c97df3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-15 22:51:51 +00:00
Songchun Fan
4c43a3dd22 [automerger skipped] Merge "[pm] forbid deletion of protected packages" into rvc-qpr-dev am: 61ec81ae9b -s ours am: 467fe36031 -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: Iff1060f06f578e587f9bb551582fb67b825544fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-15 22:51:43 +00:00
Songchun Fan
34ea3b2cf1 [automerger skipped] [pm] forbid deletion of protected packages am: 538654167a -s ours am: b4f0e16953 -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: I97d65bff99ab38d8c47336862be2e05c63f274ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-15 22:51:41 +00:00
Songchun Fan
74663b3683 [automerger skipped] Merge "[pm] forbid deletion of protected packages" into sc-dev am: b2abf2632c -s ours 
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 2d6eae165b is already in history

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

Change-Id: I704d29a70180c14c745a41f867742d1e689a2434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-15 22:51:26 +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
04d4edbc35 Merge "[pm] forbid deletion of protected packages" into sc-qpr1-dev 2022-09-15 22:17:28 +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
870c0fe4f9 Merge changes from topic "presubmit-am-86d37df06f3b4cba87f03386fed73973" into sc-qpr1-dev 
* changes:
  [automerge] [pm] forbid deletion of protected packages 2p: dba7ceb57e
  [pm] forbid deletion of protected packages
 2022-09-15 22:17:17 +00:00
Matt Pietal
582d8e0262 [automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into sc-dev am: d1afd041a1 -s ours 
am skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 1e7087f113 is already in history

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

Change-Id: I759304ca66bbc925b18a3c8ef821110cc6167693
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-15 18:05:48 +00:00
Matt Pietal
7ef1e5f3a7 [automerger skipped] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: c27cf661a6 am: 2ebce335cc -s ours am: 13ac3a30cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic5da53c01d1068f465bc07ef60d373b50f73d22e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-15 18:05:31 +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
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
Presubmit Automerger Backend
1bc514701a [automerge] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock 2p: 1e7087f113 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101

Bug: 218500036
Change-Id: Iadd85eb3e1a91b77e7ed699faed3f7a06e527921
Merged-In: I7c8714a177bc85fbce92f6e8fe911f74ca2ac243
 2022-09-14 15:00:43 +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
2d6eae165b [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:53 +00:00
Songchun Fan
989782a0ae [automerge] [pm] forbid deletion of protected packages 2p: dba7ceb57e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19942600

Bug: 242996180
Change-Id: Iadf145b648c17298f01cb085f6fa6ff12d8ad748
Merged-In: Iba408e536b340ea5d66ab499442c0c4f828fa36f
 2022-09-13 18:08:47 +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
Iván Budnik
489f92832d [automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into rvc-dev am: f8f07e22f1 am: b243407293 -s ours am: 07afb47507 -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: I60b655f3dfe4d4fcf17be855d8c3c53d9089745a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 20:55:48 +00: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
53f19e615b [automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into sc-dev am: c59352ed18 -s ours 
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I4f4b03ae8aee39d135571ec0decc055af54d0a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 16:53:50 +00:00
Iván Budnik
6d129d1cb2 [automerger skipped] Revert "Enforce ComponentName belongs to caller app" am: 8b7cf1993c -s ours 
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Ib88aedb7bcac4806ecf7250fd92db81ccaacad48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 16:53:48 +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
789a752f05 [automerger skipped] Merge "Make sure parallel broadcasts enforce excluded permissions" into sc-dev am: 3f015cbc5e -s ours 
am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 0eee4fa476 is already in history

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

Change-Id: Ib3221584615d5041294acd7c52f5d4e666e32f79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 05:04:50 +00:00