Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
425,705 Commits 3 Branches 0 Tags
3f2358892f2bf6a792603cf8548c8fe1657e8024
Commit Graph

425705 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
3f2358892f [automerger skipped] Merge "Enable user graularity for lockdown mode" into qt-dev am: 1eeb1758fd -s ours 
am skip reason: skipped by user wenhaowang

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

Change-Id: I1192bdd5e99ad44ef0b74793b5c2148848bb9fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 22:37:23 +00:00
TreeHugger Robot
1eeb1758fd Merge "Enable user graularity for lockdown mode" into qt-dev 2022-11-01 21:54:57 +00:00
David Saff
02e202676b DO NOT MERGE: Ignore flaky setup failures in qt-dev am: f83cd419e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20292026

Change-Id: I090cda5c061996e354c3cb3b1201ad4b163c5669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 16:54:46 +00:00
David Saff
f83cd419e5 DO NOT MERGE: Ignore flaky setup failures in qt-dev 
Bug: 255797461
Test: See forrest run in bug
Change-Id: Ie0b15636edb2210b44a9b96edc267ea7271cc939
 2022-10-31 13:52:37 +00:00
Khoa Hong
bee6932774 Merge "[RESTRICT AUTOMERGE] Add protections agains use-after-free issues if cancel() or queue() is called after a device connection has been closed." into qt-dev am: 9b0f39acfb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20234866

Change-Id: I2c8358a6ea996ce69435832d758d5207bdaf1f0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 04:08:40 +00:00
Khoa Hong
271b7fa23c [RESTRICT AUTOMERGE] Add protections agains use-after-free issues if cancel() or queue() is called after a device connection has been closed. am: 7a8d56b2fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20234866

Change-Id: Ib21057b8df8c9d5ad4719de60e9db7fb88765046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-31 04:08:37 +00:00
Khoa Hong
9b0f39acfb Merge "[RESTRICT AUTOMERGE] Add protections agains use-after-free issues if cancel() or queue() is called after a device connection has been closed." into qt-dev 2022-10-31 03:24:09 +00:00
Nate Myren
28c85af5dd Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into qt-dev am: d38c2bc0ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20122955

Change-Id: I9dbd8dca6329ba47b343410c45bf4c529920eab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 22:20:42 +00:00
Nate Myren
33b93dc60c RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23 am: f6ba142a84 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20122955

Change-Id: I648f48d3a0395b64bdb4119074dcfb2f104386ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 22:20:30 +00:00
Nate Myren
d38c2bc0ce Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into qt-dev 2022-10-28 21:27:28 +00:00
TreeHugger Robot
70536c0199 Merge "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" into qt-dev am: 191036a989 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20223219

Change-Id: I076b7d224f3502d95b7a8e2021489ed12f562ebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 01:30:18 +00:00
Louis Chang
7db5e05361 [RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege am: 9c19841384 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20223219

Change-Id: I91b20543e1d266adfef18922d34ff14d549e68a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-28 01:30:10 +00:00
TreeHugger Robot
191036a989 Merge "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" into qt-dev 2022-10-28 01:03:25 +00:00
TreeHugger Robot
f36b827848 Merge "[RESTRICT AUTOMERGE][SettingsProvider] key size limit for mutating settings" into qt-dev am: 14a5113c31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20251345

Change-Id: Ia06007d26778ba6776ec7e27e9867ec8b014c4d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-27 17:36:03 +00:00
Songchun Fan
95f01f6186 [RESTRICT AUTOMERGE][SettingsProvider] key size limit for mutating settings am: f1831c8712 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20251345

Change-Id: I4790c565a861fcb386929bfdaf58d0dda16a4a4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-27 17:36:01 +00:00
TreeHugger Robot
14a5113c31 Merge "[RESTRICT AUTOMERGE][SettingsProvider] key size limit for mutating settings" into qt-dev 2022-10-27 17:05:59 +00:00
TreeHugger Robot
51f0eecfc3 Merge "RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..."" into qt-dev am: 88a76a8cfc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140

Change-Id: I7239c1b42f0172e53b039383e3d46203be55dd34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-27 02:58:09 +00:00
Nate Myren
4734edc494 RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..." am: 4e83e59b27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291140

Change-Id: I673c2f2d4929ab675cf0e1b0ba87aab29e489c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-27 02:58:01 +00:00
TreeHugger Robot
88a76a8cfc Merge "RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..."" into qt-dev 2022-10-27 02:09:34 +00:00
David Saff
c5c6a916fe Merge "Disable broken NotificationStackScrollLayoutTest on qt-dev" into qt-dev am: b4ac90f433 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20281824

Change-Id: I5498db17843ed914125b5692321a29716ea2de21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-26 21:12:48 +00:00
David Saff
b4ac90f433 Merge "Disable broken NotificationStackScrollLayoutTest on qt-dev" into qt-dev 2022-10-26 20:40:59 +00:00
Nate Myren
4e83e59b27 RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..." 
Revert submission 20285709-revert-20103164-permTree-qt-dev-QWIEBZIWEA

Reason for revert: resubmission
Reverted Changes:
I0a3b68aff:Revert "RESTRICT AUTOMERGE Add PermissionMemoryFoo...
I4e8ec8b1a:Revert "RESTRICT AUTOMERGE Validate permission tre...

Change-Id: I3cd1aa270373bb32f95dfbe8422faa783ee49dca
 2022-10-26 17:58:58 +00:00
Chris Sabotta
c17c5cb249 Merge "Revert "RESTRICT AUTOMERGE Validate permission tree size on perm..."" into qt-dev am: f661f5e669 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20285708

Change-Id: I2a2c4f667d7a864cf54e9e1b26b120af7ee8a7a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-26 01:32:52 +00:00
Chris Sabotta
6d46d7f1a6 Revert "RESTRICT AUTOMERGE Validate permission tree size on perm..." am: b3fea7d1a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20285708

Change-Id: I141273c1d5ab00c89e9a14a054b98ea6ce0ab62c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-26 01:32:37 +00:00
Chris Sabotta
f661f5e669 Merge "Revert "RESTRICT AUTOMERGE Validate permission tree size on perm..."" into qt-dev 2022-10-26 00:52:51 +00:00
Chris Sabotta
b3fea7d1a8 Revert "RESTRICT AUTOMERGE Validate permission tree size on perm..." 
Revert submission 20103164-permTree-qt-dev

Reason for revert: build breakage b/255661858
Reverted Changes:
I15343e84c:RESTRICT AUTOMERGE Validate permission tree size o...
If16ecb7be:RESTRICT AUTOMERGE Add PermissionMemoryFootprintTe...

Change-Id: I4e8ec8b1a609d0e7a6bb379579014c82a9825101
 2022-10-26 00:49:58 +00:00
Nate Myren
19a62f65cb Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into qt-dev am: 2d9de7b6ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20103164

Change-Id: I2ae02e5cda9967aebbb8542fb203a274d4537ca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-25 20:21:01 +00:00
Nate Myren
d459666450 RESTRICT AUTOMERGE Validate permission tree size on permission update am: ce6ae95066 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20103164

Change-Id: I01c1a808385e0b8e7b669d94325630f98ba679b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-25 20:20:50 +00:00
Nate Myren
2d9de7b6ef Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into qt-dev 2022-10-25 19:24:24 +00:00
Nate Myren
ce6ae95066 RESTRICT AUTOMERGE Validate permission tree size on permission update 
Bug: 242537498
Test: manual
Change-Id: I15343e84c1802d6b89249106263319a6539fa73b
Merged-In: I15343e84c1802d6b89249106263319a6539fa73b
 2022-10-25 16:28:12 +00:00
David Saff
b23782141b Disable broken NotificationStackScrollLayoutTest on qt-dev 
Test: presubmit & abtd
Bug: 255552856
Bug: 255368934
Change-Id: Ibc2edc99f99e02edc5dd75486dda64b945223569
 2022-10-25 16:16:20 +00:00
Songchun Fan
f1831c8712 [RESTRICT AUTOMERGE][SettingsProvider] key size limit for mutating settings 
Prior to targetSdk 22, apps could add random system settings keys which
opens an opportunity for OOM attacks. This CL adds a key size limit.

BUG: 239415997
Test: manual; will add cts test
Merged-In: Ic9e88c0cc3d7206c64ba5b5c7d15b50d1ffc9adc
Change-Id: Ic9e88c0cc3d7206c64ba5b5c7d15b50d1ffc9adc
(cherry picked from commit 783bcba343)
 2022-10-24 17:29:19 +00:00
Louis Chang
9c19841384 [RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege 
The activity info could be from another uid which is different
from the app that hosts the task. The information should be
trimmed if the caller app doesn't have the privilege.

Bug: 243130512
Test: verified locally
Test: atest RecentTasksTest
Change-Id: Ia343ac70e5bb9aeae718fca6674e1ca491a14512
(cherry picked from commit 401e782b24)
 2022-10-20 13:54:23 +00:00
Songchun Fan
8451db5766 [SettingsProvider] mem limit should be checked before settings are updated am: d85a428210 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20211078

Change-Id: If42885e3a174636bc373194f47495d12a9f0bce2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-19 18:45:50 +00:00
Songchun Fan
d85a428210 [SettingsProvider] mem limit should be checked before settings are updated 
Previously, a setting is updated before the memory usage limit
check, which can be exploited by malicious apps and cause OoM DoS.

This CL changes the logic to checkMemLimit -> update -> updateMemUsage.

BUG: 239415861
Test: atest com.android.providers.settings.SettingsStateTest

(cherry picked from commit 8eeb92950f)
Merged-In: I20551a2dba9aa79efa0c064824f349f551c2c2e4
Change-Id: I20551a2dba9aa79efa0c064824f349f551c2c2e4
 2022-10-19 08:43:07 -07:00
Khoa Hong
7a8d56b2fe [RESTRICT AUTOMERGE] Add protections agains use-after-free issues if cancel() or queue() is called after a device connection has been closed. 
This is a backport of ag/7528082 and ag/20033068.

Bug: 132319116
Bug: 130571162
Bug: 204584366
Test: CTS Verifier: USB Accessory Test & USB Device Test
Change-Id: I952ab566e26a808997e362dc85ebd1d8eb4574b9
 2022-10-19 08:41:24 +00:00
Yuri Lin
f663191969 Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into qt-dev am: 600ecb01d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20208339

Change-Id: I944204472cc2784adea2a821423877d11d7fd598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:28:57 +00:00
Yuri Lin
7c930d9283 [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 303f6bde89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20208339

Change-Id: I8183044f038567ba8061959e0ea372f3b047944f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:28:44 +00:00
Yuri Lin
600ecb01d0 Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into qt-dev 2022-10-18 21:06:37 +00:00
Nate Myren
f6ba142a84 RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23 
Bug: 221040577
Test: atest PermissionTest23#testPre23AppsWithSystemAlertWindowGetDeniedOnUpgrade
Change-Id: I4b4605aaae107875811070dea6d031c5d9f25c96
 2022-10-18 20:49:46 +00:00
Yuri Lin
303f6bde89 [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule 
This change only applies to S branches and earlier.

Bug: 253085433
Bug: 242703460
Bug: 242703505
Bug: 242703780
Bug: 242704043
Bug: 243794204
Test: AutomaticZenRuleTest
Change-Id: Iae423d93b777df8946ecf1c3baf640fcf74990ec
Merged-In: Iae423d93b777df8946ecf1c3baf640fcf74990ec
 2022-10-18 15:30:15 +00:00
Daniel Norman
49cd9427ef Merge "RESTRICT AUTOMERGE Disable all A11yServices from an uninstalled package." into qt-dev am: dc0095e9e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20120242

Change-Id: I29402acd041202995bb359511ec93c740310befc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 20:11:05 +00:00
Daniel Norman
07b90715f9 RESTRICT AUTOMERGE Disable all A11yServices from an uninstalled package. am: 3796629985 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20120242

Change-Id: Ib593fd95127da2dde8fde254fa080d985535aedc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 20:10:52 +00:00
Daniel Norman
dc0095e9e4 Merge "RESTRICT AUTOMERGE Disable all A11yServices from an uninstalled package." into qt-dev 2022-10-17 19:44:36 +00:00
Wenhao Wang
ce5a334f1d Enable user graularity for lockdown mode 
The NotificationManagerService registers a LockPatternUtils.StrongAuthTracker
to observe the StrongAuth changes of every user.
More specifically, it’s the STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN flag.
Via this flag, NotificationManagerService can perform the following operations
when the user enter or exit lockdown mode:

Enter lockdown:
1. Remove all the notifications belonging to the user.
2. Set the local flag to indicate the lockdown is on for the user.
   The local flag will suppress the user's notifications on the
   post, remove and update functions.

Exit lockdown:
1. Clear the local flag to indicate the lockdown is off for the user.
2. Repost the user’s notifications (suppressed during lockdown mode).

The CL also updates corresponding tests.

Bug: 173721373
Bug: 250743174
Test: atest NotificationManagerServiceTest
Test: atest NotificationListenersTest
Ignore-AOSP-First: pending fix for a security issue.

Change-Id: I4f30e56550729db7d673a92d2a1250509713f36d
Merged-In: I4f30e56550729db7d673a92d2a1250509713f36d
(cherry picked from commit de3b12fca2)
 2022-10-14 11:03:38 -07:00
TreeHugger Robot
676cefb0ee Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545

Change-Id: I3bf51cd6e7046c7e128f1008ed830c5e02603f88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-08 12:05:20 +00:00
TreeHugger Robot
62044e5099 Merge "Stop managed profile owner granting READ_SMS" into qt-dev 2022-10-08 11:41:10 +00:00
Daniel Norman
3796629985 RESTRICT AUTOMERGE Disable all A11yServices from an uninstalled package. 
Previous logic would exit the loop after removing the first service
matching the uninstalled package.

Bug: 243378132
Test: atest AccessibilityEndToEndTest
Test: m sts;
      sts-tradefed run sts-dynamic-develop -m \
        CtsAccessibilityServiceTestCases
Change-Id: I4ba30345d8600674ee8a9ea3ff411aecbf3655a3
 2022-10-07 19:20:53 +00:00
Hao Ke
64e4cbc1d8 Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev am: 459808b2c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105519

Change-Id: I38314b7569ac5e5fbdffc43b734ec996178e7c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 19:29:54 +00:00
Hao Ke
459808b2c0 Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev 2022-10-05 18:40:44 +00:00