Commit Graph

500020 Commits

Author SHA1 Message Date
Jeff DeCew
fcb0f9a684 [RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI am: c60e264a55
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312942

Change-Id: I27f47ec403bb7465736a61353727e23ed3b833e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:22:52 +00:00
Pavel Grafov
0e7ecf6fbe Merge "Enforce DevicePolicyManager.setUserControlDisabledPackages in AppStandbyController" into rvc-dev am: b4083e039e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22301867

Change-Id: Ibf1c9fb61e6b987d2b5676ab8eb193d96e70515d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 14:37:05 +00:00
Pavel Grafov
b4083e039e Merge "Enforce DevicePolicyManager.setUserControlDisabledPackages in AppStandbyController" into rvc-dev 2023-03-31 14:09:57 +00:00
Julia Reynolds
47a0fdbe46 [automerger skipped] Merge "Allow filtering of services" into rvc-dev am: 9fa258770e -s ours
am skip reason: Merged-In Ib4740ba401667de62fa1a33334c2c1fbee25b760 with SHA-1 bbc68b5aa7 is already in history

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

Change-Id: Ic72ecd13de182bd87a8dfc8864e74841d9977a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 15:57:13 +00:00
Julia Reynolds
ec28f4a497 [automerger skipped] Allow filtering of services am: 44dcb8351e -s ours
am skip reason: Merged-In Ib4740ba401667de62fa1a33334c2c1fbee25b760 with SHA-1 bbc68b5aa7 is already in history

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

Change-Id: Ia4206cfa6379781ec9859628c1c8c6aec432fca8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 15:56:56 +00:00
Julia Reynolds
9fa258770e Merge "Allow filtering of services" into rvc-dev 2023-03-29 15:25:15 +00:00
Julia Reynolds
44dcb8351e Allow filtering of services
Test: ServiceListingTest
Bug: 260570119
Change-Id: Ib4740ba401667de62fa1a33334c2c1fbee25b760
Merged-In: Ib4740ba401667de62fa1a33334c2c1fbee25b760
2023-03-29 13:22:33 +00:00
TreeHugger Robot
f3aa954ba6 [automerger skipped] Merge "Handle invalid data during job loading." into qt-dev am: ba8c9b4f2d am: b59868db83 -s ours am: 36fd98e6b5 -s ours
am skip reason: Merged-In Id0ceba345942baf21177f687b8dd85ef001c0a9e with SHA-1 df1ba00dd9 is already in history

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

Change-Id: Ia51ba8c4700510919ad4013d09b22dca9da86b60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 05:20:05 +00:00
TreeHugger Robot
36fd98e6b5 [automerger skipped] Merge "Handle invalid data during job loading." into qt-dev am: ba8c9b4f2d am: b59868db83 -s ours
am skip reason: Merged-In Id0ceba345942baf21177f687b8dd85ef001c0a9e with SHA-1 df1ba00dd9 is already in history

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

Change-Id: Ibacc09f78b4dca469da219441563597a03282ede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 04:51:28 +00:00
TreeHugger Robot
b59868db83 Merge "Handle invalid data during job loading." into qt-dev am: ba8c9b4f2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20026092

Change-Id: I3cbb3042328108ba2847cffede3f56c73d34290d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 04:24:56 +00:00
TreeHugger Robot
ba8c9b4f2d Merge "Handle invalid data during job loading." into qt-dev 2023-03-29 03:52:02 +00:00
Kweku Adams
a9d54c2d90 Handle invalid data during job loading.
Catch exceptions that may be thrown if invalid data ended up in the
persisted job file.

Bug: 246541702
Bug: 246542132
Bug: 246542285
Bug: 246542330
Test: install test app with invalid job config, start app to schedule job, then reboot device
Change-Id: Id0ceba345942baf21177f687b8dd85ef001c0a9e
(cherry picked from commit c98fb42b48)
Merged-In: Id0ceba345942baf21177f687b8dd85ef001c0a9e
2023-03-28 21:31:12 +00:00
Julia Reynolds
dc357529dc Merge "Allow filtering of services" into rvc-qpr-dev 2023-03-28 20:16:25 +00:00
Kweku Adams
71e0ce3027 Merge "Handle invalid data during job loading." into rvc-qpr-dev 2023-03-28 20:07:45 +00:00
TreeHugger Robot
41487df617 Merge "Handle invalid data during job loading." into rvc-dev am: 2ef87719c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20026095

Change-Id: Ie40e98098158ce31d73f8c3af573d85807ad4cf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 19:41:13 +00:00
TreeHugger Robot
2ef87719c8 Merge "Handle invalid data during job loading." into rvc-dev 2023-03-28 19:24:54 +00:00
Alex Johnston
552dbbc142 Enforce DevicePolicyManager.setUserControlDisabledPackages in AppStandbyController
When deciding an app's standby bucket, check if the
app has its user control disabled by an IT admin. If so,
the app should be the exempted restricted bucket.

Bug: 272042183
Test: atest AppStandbyControllerTests
Change-Id: I4279dc37f0e17aedb1c2a87468478248443a253e
Merged-In: I4279dc37f0e17aedb1c2a87468478248443a253e
(cherry picked from commit 269fcb6873)
2023-03-28 17:01:14 +00:00
Jeff DeCew
c60e264a55 [RESTRICT AUTOMERGE] Add BubbleMetadata detection to block FSI
Bug: 274759612
Test: atest NotificationInterruptStateProviderImplTest
Change-Id: I40e1aa6377b8a60d91cb2f4189df1e9a4a4578a2
2023-03-28 13:58:19 +00:00
Julia Reynolds
bbc68b5aa7 Allow filtering of services
Test: ServiceListingTest
Bug: 260570119
Change-Id: Ib4740ba401667de62fa1a33334c2c1fbee25b760
Merged-In: Ib4740ba401667de62fa1a33334c2c1fbee25b760
2023-03-27 16:13:40 +00:00
Dmitry Dementyev
f6228ade76 [automerger skipped] Merge "Check key intent for selectors and prohibited flags" into rvc-dev am: c162515bd5 -s ours
am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 f7ba4ef2f8 is already in history

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

Change-Id: I4d526564e42e106dbb87cf99dfffcac2f05c5c74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:21:26 +00:00
Brian Lee
de18b4c09f [automerger skipped] Check key intent for selectors and prohibited flags am: 92114886bd -s ours
am skip reason: Merged-In Ie16f8654337bd75eaad3156817470674b4f0cee3 with SHA-1 f7ba4ef2f8 is already in history

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

Change-Id: Ida1ddbdda283fb6fe3d2446e1e59903a8cad53cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 20:21:06 +00:00
Dmitry Dementyev
c162515bd5 Merge "Check key intent for selectors and prohibited flags" into rvc-dev 2023-03-23 19:51:55 +00:00
Dmitry Dementyev
7b2b263042 Merge "Check key intent for selectors and prohibited flags" into rvc-qpr-dev 2023-03-23 19:51:40 +00:00
TreeHugger Robot
fd98ec2c77 Merge "[DO NOT MERGE] Prevent RemoteViews crashing SystemUi" into rvc-dev am: 677e9e1181
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22101922

Change-Id: Ie5afdf862051a4b7cc2149710515ca453fb56b08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 19:20:38 +00:00
Valentin Iftime
40c824230a [DO NOT MERGE] Prevent RemoteViews crashing SystemUi am: cfc0b34432
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22101922

Change-Id: I62e92592c74fbcd08b022e1d332ec96a79b1b7e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 19:20:28 +00:00
TreeHugger Robot
677e9e1181 Merge "[DO NOT MERGE] Prevent RemoteViews crashing SystemUi" into rvc-dev 2023-03-22 18:47:42 +00:00
Jean Chalard
749b03d2e6 Merge "Sanitize VPN label to prevent HTML injection" into rvc-dev am: 230c7ab574
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20460002

Change-Id: Id679bb24798cc732bd1cd5d6abefb08bcf552a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 06:03:59 +00:00
Jean Chalard
230c7ab574 Merge "Sanitize VPN label to prevent HTML injection" into rvc-dev 2023-03-20 05:22:22 +00:00
Brian Lee
92114886bd Check key intent for selectors and prohibited flags
Bug: 265015796
Test: atest
FrameworksServicesTests: com.android.server.accounts.AccountManagerServiceTest
Change-Id: Ie16f8654337bd75eaad3156817470674b4f0cee3
(cherry picked from commit e53a963043)
Merged-In: Ie16f8654337bd75eaad3156817470674b4f0cee3
2023-03-16 22:49:22 +00:00
Valentin Iftime
cfc0b34432 [DO NOT MERGE] Prevent RemoteViews crashing SystemUi
Catch canvas drawing exceptions caused  by unsuported image sizes.

Test: 1. Post a custom view notification with a layout
	containing an ImageView that references a 5k x 5k image
2. Add an App Widget to the home screen with that has the
	layout mentioned above as preview/initial layout.

Bug: 268193777

Change-Id: Ib3bda769c499b4069b49c566b1b227f98f707a8a
Merged-In: Ib3bda769c499b4069b49c566b1b227f98f707a8a
2023-03-15 18:34:50 +01:00
Valentin Iftime
80c5f50d2c [DO NOT MERGE] Wait for preloading images to complete before inflating notifications am: 733089e71c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21609150

Change-Id: I4c4025af1ee90e5161e4b544d8ab5087e8783339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 17:52:40 +00:00
Valentin Iftime
733089e71c [DO NOT MERGE] Wait for preloading images to complete before inflating notifications
NotificationContentInflater waits on SysUiBg thread for images to load, with a timeout
 of 1000ms.

Test: 1. Build a test app that posts MessagingStyle notifications with a huge image (8k+) set as data Uri.
 2. SystemUi should not ANR
 3. adb logcat | grep NotificationInlineImageCache  - shows timeout/cancellation logs

Bug: 252766417
Bug: 223859644

Change-Id: I341db60223214cf2282b5c0270e343e1ce95fa01
(cherry picked from commit 195043f40e)
Merged-In: I341db60223214cf2282b5c0270e343e1ce95fa01
2023-03-10 10:30:49 +01:00
Lucas Lin
2178216b98 Sanitize VPN label to prevent HTML injection
This commit will try to sanitize the content of VpnDialog. This
commit creates a function which will try to sanitize the VPN
label, if the sanitized VPN label is different from the original
one, which means the VPN label might contain HTML tag or the VPN
label violates the words restriction(may contain some wording
which will mislead the user). For this kind of case, show the
package name instead of the VPN label to prevent misleading the
user.

The malicious VPN app might be able to add a large number of line
breaks with HTML in order to hide the system-displayed text from
the user in the connection request dialog. Thus, sanitizing the
content of the dialog is needed.

Bug: 204554636
Test: N/A
Change-Id: I8eb890fd2e5797d8d6ab5b12f9c628bc9616081d
Merged-In: I8eb890fd2e5797d8d6ab5b12f9c628bc9616081d
2023-03-09 21:14:14 +09:00
Arthur Hung
727c672f0f Merge "Fix WindowInputTests#testOverlapWindow failing (1/2)" into rvc-dev am: 33a2bc8f7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21781625

Change-Id: Ibcdf0496f6f75fa4608754f4ed64e063d6e9bafe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 03:48:36 +00:00
Arthur Hung
33a2bc8f7a Merge "Fix WindowInputTests#testOverlapWindow failing (1/2)" into rvc-dev 2023-03-06 03:18:58 +00:00
Pinyao Ting
1d4b958078 Merge "Limit the number of shortcuts per app that can be retained by system" into rvc-dev am: 15ae228ddb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21564438

Change-Id: I9e61356ca633c6800098a5511b7330db7a4503ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-05 07:20:07 +00:00
Pinyao Ting
15ae228ddb Merge "Limit the number of shortcuts per app that can be retained by system" into rvc-dev 2023-03-05 06:41:17 +00:00
Pinyao Ting
2296ccfde0 Limit the number of shortcuts per app that can be retained by system
This is a second attempt at fixing the issue, the previous CL
ag/20642213 was reverted because it simply throws an exception when the
limit is reached, which causes apps to crash since chat apps tends to be
sending large amount of conversation shortcuts and they have no way to
know how many of these shortcuts are still cached by the system.

Instead of throwing an exception, this CL simply removes excessive
shortcuts to avoid crashes. Currently there is a limit on the number
of shortcuts an app can publish in respect to each launcher activity.
This CL further implements a global maximum of total number of shortcuts
that can be retained for an app to mitigate from any potential system
health issue.

When the global maximum is reached, ShortcutService will proactively
removes shortcuts from system memory. Cached shortcuts are removed
first, followed by dynamic shortcuts, using last updated time as
tie-breaker.

This CL additionally addresses an unexpected flow where re-publishing
previously removed shortcuts that are still retained by the system could
cause the total number of shortcuts to exceed previously set limit.

Bug: 250576066 233155034
Test: manual
Change-Id: I001c7a87b62aefa9487bf8efaf3cd02d7cb21521
Merged-In: I001c7a87b62aefa9487bf8efaf3cd02d7cb21521
2023-03-05 02:55:25 +00:00
arthurhung
657c2a4115 Fix WindowInputTests#testOverlapWindow failing (1/2)
The 'InputWindowInfo.isTrustedOverlay' function had been removed, we
have to indicate the trustedOverlay flag when fill input info to overlay
window.

Bug: 161789401
Bug: 158717144
Test: atest WindowInputTests
Change-Id: Idf17fd64c6a1399d04c51e3f0bd600dc4a84239a
Merged-In: Idf17fd64c6a1399d04c51e3f0bd600dc4a84239a
2023-03-04 17:08:19 +00:00
Mark Renouf
b4f4ac8e45 Prevent sharesheet from previewing unowned URIs am: 3062b80fb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21535256

Change-Id: Id2dc05799f7a12b6ef2974bdbb6e6f211d6942fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 13:57:52 +00:00
Mark Renouf
3062b80fb2 Prevent sharesheet from previewing unowned URIs
Bug: 261036568
Test: manually via supplied tool (see bug)
Change-Id: I21accf6f753d2f676f1602d6e1ce829c5ef29e9a
Merged-In: I582bacca197d814204b48b917a550f72dbde87d6
Merged-In: Ib3f5839d00c7cf09bca3b01fc0a8a6f0f4960993
Merged-In: Iee1a75ef6ecbf471badeb42d8ebea11e74d884c1
Merged-In: I83e93c373538460e38ec17f1fd8e39d7aea95c10
2023-03-04 12:27:28 +00:00
Hongwei Wang
d6a9b8078a Merge "Remove Activity if it enters PiP without window" into rvc-dev am: 81224e6f76
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21564420

Change-Id: I707ee5856d28f823559d3e8d3e43e5803685ca6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 06:29:50 +00:00
Ioana Alexandru
c802fa5c63 [automerger skipped] Trim strings added to persistent snoozed notification storage. am: 931093dfb4 -s ours
am skip reason: Merged-In If7c7db6694330ffbac551d044efadb26219fe17f with SHA-1 6b587717ce is already in history

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

Change-Id: I1c5e33fb6cd7403f49d35822c908625d05cdc02a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 06:29:14 +00:00
Hongwei Wang
81224e6f76 Merge "Remove Activity if it enters PiP without window" into rvc-dev 2023-03-04 01:20:30 +00:00
Ioana Alexandru
6b587717ce Trim strings added to persistent snoozed notification storage.
This is a backport of ag/20581190 and includes the fix in ag/20778075.
Note that on this branch, clearData doesn't seem to actually clear persistent storage.

Bug: 258422365
Test: atest NotificationManagerServiceTest SnoozeHelperTest
Change-Id: If7c7db6694330ffbac551d044efadb26219fe17f
Merged-In: I5a2823f10053ea8c83c612a567d6d4f1b6af23e7
Merged-In: Ie809cb4d648a40622618e0fb374f36b6d8dc972a
Merged-In: If7c7db6694330ffbac551d044efadb26219fe17f
2023-03-03 21:42:21 +00:00
Ioana Alexandru
931093dfb4 Trim strings added to persistent snoozed notification storage.
This is a backport of ag/20581190 and includes the fix in ag/20778075.
Note that on this branch, clearData doesn't seem to actually clear persistent storage.

Bug: 258422365
Test: atest NotificationManagerServiceTest SnoozeHelperTest
Change-Id: If7c7db6694330ffbac551d044efadb26219fe17f
Merged-In: I5a2823f10053ea8c83c612a567d6d4f1b6af23e7
Merged-In: Ie809cb4d648a40622618e0fb374f36b6d8dc972a
Merged-In: If7c7db6694330ffbac551d044efadb26219fe17f
2023-03-03 21:41:05 +00:00
Jing Ji
41c877702a Merge "DO NOT MERGE: ActivityManager#killBackgroundProcesses can kill caller's own app only" into rvc-dev am: 5d4989646c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20309299

Change-Id: Iff034ff6ecce1d42d92683f630ca68dbaca554b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 05:35:47 +00:00
Jing Ji
b6b8310571 DO NOT MERGE: ActivityManager#killBackgroundProcesses can kill caller's own app only am: 8b382775b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20309299

Change-Id: I501384d2eb14ab04fdca8c6638db7dba679e0e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 05:35:28 +00:00
Jing Ji
5d4989646c Merge "DO NOT MERGE: ActivityManager#killBackgroundProcesses can kill caller's own app only" into rvc-dev 2023-03-03 00:43:37 +00:00
Jing Ji
c928fa63f9 Merge "DO NOT MERGE: ActivityManager#killBackgroundProcesses can kill caller's own app only" into rvc-qpr-dev 2023-03-03 00:42:16 +00:00