Commit Graph

483267 Commits

Author SHA1 Message Date
TreeHugger Robot
2fcbfbf644 [automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev am: 8a2baf4e16 am: de5113eebd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I519e92f1b6ed06675d1c3bea1ee817f05e1ee241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-03 21:33:29 +00:00
Pinyao Ting
0750f90369 [automerger skipped] [Do Not Merge] Ignore malformed shortcuts am: 9b0dd514d2 am: f67179a1ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: I660704085d0f838fc10ab1a280262c86faf41c8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-03 21:33:09 +00:00
TreeHugger Robot
de5113eebd Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev am: 8a2baf4e16
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225

Change-Id: If25d47e0bf3f6b5fd6d33dcdd57e82e5475ba893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-03 21:05:51 +00:00
Pinyao Ting
f67179a1ff [Do Not Merge] Ignore malformed shortcuts am: 9b0dd514d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225

Change-Id: I4591ed42f0af65bab2679fdc99aa824b28ba0a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-03 21:05:36 +00:00
TreeHugger Robot
8a2baf4e16 Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev 2022-10-03 20:23:07 +00:00
Matt Pietal
974a8471ea [automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev am: 2663e8aa43 am: 4f404a5015 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1a7ec8e03a49993aa99f2b8317755b1569e70b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 14:24:54 +00:00
Matt Pietal
4b70b75d1c [automerger skipped] [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 am: d78f1693ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: If6b7f47d6cdb87b4861b925a1fa0a2db742632b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 14:24:30 +00:00
Matt Pietal
4f404a5015 Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev am: 2663e8aa43
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952040

Change-Id: Id5d34e9689120d991ca8904938c38c81cd018ad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 13:57:36 +00:00
Matt Pietal
d78f1693ef [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952040

Change-Id: Ie7874f87fa568f76047a9e08dae3d406b7b565f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 12:52:00 +00:00
Matt Pietal
2663e8aa43 Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev 2022-09-27 19:25:13 +00:00
Matt Pietal
d7710fc38a Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into rvc-dev 2022-09-27 18:05:36 +00:00
Jeff Chang
d667038512 Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into rvc-dev 2022-09-26 01:43:42 +00:00
Pinyao Ting
af809557f8 Merge "Fix a security issue in app widget service." into qt-dev am: 5a292b8bf4 am: f90c770087
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20026360

Change-Id: I170c5947cf1aedce8dfd11a99132bcbb1a760b4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 20:45:30 +00:00
Pinyao Ting
f90c770087 Merge "Fix a security issue in app widget service." into qt-dev am: 5a292b8bf4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20026360

Change-Id: I153e3da4a1208d7f4bcd3818902993108f80a6a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 20:20:04 +00:00
Pinyao Ting
5a292b8bf4 Merge "Fix a security issue in app widget service." into qt-dev 2022-09-23 19:57:23 +00:00
Julia Reynolds
bdb417dc04 Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886859

Change-Id: Ic90281a2476860b6d7537162f1921c2a31e8b206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:57:45 +00:00
Julia Reynolds
23ffc379fe Merge "Fix NPE" into qt-dev am: 261b601d25
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886859

Change-Id: I1d34705e2995a26c7f396fef7027031d62010990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:31:57 +00:00
Julia Reynolds
261b601d25 Merge "Fix NPE" into qt-dev 2022-09-22 18:37:39 +00:00
Pinyao Ting
0ee21ef3e6 Fix a security issue in app widget service.
Bug: 234013191
Test: atest RemoteViewsAdapterTest
Change-Id: Icd2eccb7a90124aca18a3dd463c3f79e3a595c20
Merged-In: Icd2eccb7a90124aca18a3dd463c3f79e3a595c20
(cherry picked from commit 263d7d0ba8)
2022-09-22 18:01:28 +00:00
Yuri Lin
8b8e224019 [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into qt-dev am: da63d3e028 am: 32dfdfc4b7 -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 80c0fcf06d is already in history

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

Change-Id: I5f1825ebb00bb23ec0686242523169848151db46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 17:21:05 +00:00
Julia Reynolds
e26a608623 Merge "Fix NPE" into rvc-dev 2022-09-22 17:05:34 +00:00
Yuri Lin
32dfdfc4b7 Merge "Limit lengths of fields in Condition to a max length." into qt-dev am: da63d3e028
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19970324

Change-Id: I06091b361f631908f0342e05c006ac00167b29bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:11:34 +00:00
Yuri Lin
415d288b12 Merge "Limit lengths of fields in Condition to a max length." into rvc-dev 2022-09-22 15:21:33 +00:00
Yuri Lin
da63d3e028 Merge "Limit lengths of fields in Condition to a max length." into qt-dev 2022-09-22 15:21:17 +00:00
Pinyao Ting
9b0dd514d2 [Do Not Merge] Ignore malformed shortcuts
After an app publishes a shortcut that contains malformed intent, the
system can be stuck in boot-loop due to uncaught exception caused by
parsing the malformed intent.

This CL ignores that particular malformed entry. Since shortcuts are
constantly writes back into the xml from system memory, the malformed
entry will be removed from the xml the next time system persists
shortcuts from memory to file system.

Bug: 246540168
Change-Id: Ie1e39005a5f9d8038bd703a5bc845779c2f46e94
Test: manual
2022-09-21 23:03:20 +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
74592430e2 Merge "[pm] forbid deletion of protected packages" into rvc-dev 2022-09-15 22:17:49 +00:00
Songchun Fan
b625b562c4 Merge "[pm] forbid deletion of protected packages" into qt-dev 2022-09-15 20:58:34 +00:00
Yuri Lin
5cb217fff3 Limit lengths of fields in Condition to a max length.
This app-generated input needs to not be too long to avoid errors in the process of writing to disk.

Bug: 242846316
Test: cts ConditionTest; atest ConditionTest; manually verified exploit apk is OK

Change-Id: Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9
Merged-In: Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9
(cherry picked from commit 81352c3775)
2022-09-15 18:06:30 +00:00
Yuri Lin
80c0fcf06d Limit lengths of fields in Condition to a max length.
This app-generated input needs to not be too long to avoid errors in the process of writing to disk.

Bug: 242846316
Test: cts ConditionTest; atest ConditionTest; manually verified exploit apk is OK

Change-Id: Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9
Merged-In: Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9
(cherry picked from commit 81352c3775)
2022-09-15 18:03:19 +00:00
Matt Pietal
c561831af7 [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing
This will prevent bouncer interactions from showing up in
screenrecords or screenshots.

Fixes: 215005011
Test: atest StatusBarWindowControllerTest && take screenshot
with bouncer up

Merged-In: I3f59df865dc2dd13d4b9ac54bb2dacb7b23f0aa1
Change-Id: I8df2258863b8cede5ba112331e0446f534267ba2
2022-09-15 17:52:28 +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
bc2146966b [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing
This will prevent bouncer interactions from showing up in
screenrecords or screenshots.

Fixes: 215005011
Test: atest NotificationShadeWindowControllerImpl && take screenshot
with bouncer up

Merged-In: I3f59df865dc2dd13d4b9ac54bb2dacb7b23f0aa1
Change-Id: Icde7849a181ce8e0c1074537f6dde897aedd8bb3
2022-09-14 18:05:29 +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
Jeff Chang
7da08c6bd3 [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied
Any malicious application could hijack tasks by
android:allowTaskReparenting. This vulnerability can perform UI
spoofing or spying on user’s activities.

This CL only allows activities to be reparent while
android:allowTaskReparenting is applied and the affinity of activity
is same with the target task.

Bug: 240663194
Test: atest IntentTests
Change-Id: I73abb9ec05af95bc14f887ae825a9ada9600f771
2022-09-14 16:10:42 +08: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
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
Julia Reynolds
a375542897 Fix NPE
Test: NotificationChannelGroupTest
Test: view notification settings for an app that doesn't use groups
Fixes: 244574602
Bug: 241764350
Bug: 241764340
Bug: 241764135
Bug: 242702935
Bug: 242703118
Bug: 242703202
Bug: 242702851
Bug: 242703217
Bug: 242703556
Change-Id: I9c681106f6d645e62b0e44903d40aa523fee0e95
(cherry picked from commit 6f02c07176)
2022-09-08 14:05:01 +00:00
Julia Reynolds
ad30b85784 Fix NPE
Test: NotificationChannelGroupTest
Test: view notification settings for an app that doesn't use groups
Fixes: 244574602
Bug: 241764350
Bug: 241764340
Bug: 241764135
Bug: 242702935
Bug: 242703118
Bug: 242703202
Bug: 242702851
Bug: 242703217
Bug: 242703556
Change-Id: I9c681106f6d645e62b0e44903d40aa523fee0e95
(cherry picked from commit 6f02c07176)
2022-09-08 14:04:25 +00:00