Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
483,323 Commits 3 Branches 0 Tags
fecdde0e5700ea61785f4b9c5b98cd59fc33d081
Commit Graph

483323 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Sabotta
fecdde0e57 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Validate permission tree size on perm..."" into qt-dev am: f661f5e669 am: c17c5cb249 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5535c5bdead847cca51b627be6cc3f75e1b81d22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-26 02:00:24 +00:00
Chris Sabotta
1fd4bcec67 [automerger skipped] Revert "RESTRICT AUTOMERGE Validate permission tree size on perm..." am: b3fea7d1a8 am: 6d46d7f1a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9a6da1dfc8fcd84d9de4d394c285bc383efa568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-26 02:00:06 +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
18ab349ff5 [automerger skipped] Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into qt-dev am: 2d9de7b6ef am: 19a62f65cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I034b290b2adc5d038e0d205c7328f75f200c4f20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-25 20:49:27 +00:00
Nate Myren
46041377f7 [automerger skipped] RESTRICT AUTOMERGE Validate permission tree size on permission update am: ce6ae95066 am: d459666450 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib9eba47f904d02199f790acfd39f4b9bbd79c381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-25 20:49:08 +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
4d96a79f54 Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into rvc-dev 2022-10-25 17:54: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
Nate Myren
8fdf4530aa RESTRICT AUTOMERGE Validate permission tree size on permission update 
Bug: 242537498
Test: manual
Change-Id: I15343e84c1802d6b89249106263319a6539fa73b
Merged-In: I15343e84c1802d6b89249106263319a6539fa73b
 2022-10-25 16:28:05 +00:00
Songchun Fan
8a46d49bd4 [automerger skipped] [SettingsProvider] mem limit should be checked before settings are updated am: d85a428210 am: 8451db5766 -s ours 
am skip reason: Merged-In I20551a2dba9aa79efa0c064824f349f551c2c2e4 with SHA-1 f22267f8b2 is already in history

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

Change-Id: I4dd44b098e44ebe6e6083ae357d297be3c6dbbd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-19 19:13:37 +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
Song Chun Fan
43c9711338 Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into rvc-dev 2022-10-18 23:11:17 +00:00
Yuri Lin
31b5a32547 [automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into qt-dev am: 600ecb01d0 am: f663191969 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf10cc88d509f9f9a6be6dfc3d536b6ebbc72013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:55:49 +00:00
Yuri Lin
814d0484b5 [automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 303f6bde89 am: 7c930d9283 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id73e77cc8a38c93e73f09b56dc52886a62ebc5da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:55:32 +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
Yuri Lin
209b83712b Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into rvc-dev 2022-10-18 21:06:30 +00:00
Songchun Fan
f22267f8b2 [RESTRICT AUTOMERGE] [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-18 19:28:18 +00:00
Yuri Lin
83d23fb275 [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:27 +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
822eef4399 [automerger skipped] Merge "RESTRICT AUTOMERGE Disable all A11yServices from an uninstalled package." into qt-dev am: dc0095e9e4 am: 49cd9427ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ief1d988dd6dbb45206bb1056a4e184bb64de0c7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 20:36:45 +00:00
Daniel Norman
296365ae97 [automerger skipped] RESTRICT AUTOMERGE Disable all A11yServices from an uninstalled package. am: 3796629985 am: 07b90715f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic0b9c86fd3cbbb88915d34d5a34816655995ac48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 20:36:29 +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
Daniel Norman
e6d10db58e Merge "Disable all A11yServices from an uninstalled package." into rvc-dev 2022-10-17 19:44:35 +00:00
TreeHugger Robot
57963a33a8 Merge "Stop managed profile owner granting READ_SMS" into rvc-dev 2022-10-17 13:48:09 +00:00
William Loh
3ae3406b97 Limit length and number of MIME types you can set 
Limit character length of MIME types to 255. If this length is exceeded
then a IllegalArugmentException is thrown. The number of MIME types that
can be set is also limited to 500 per MIME group with the number of
total MIME Groups also limited to 500. A IllegalStateException is thrown if this number is exceeded.

Bug: 237291548
Test: Installed and ran POC app from b/237291548
Change-Id: I1d57e674f778cfacdc89225ac3273c432a39af63
Merged-In: I1d57e674f778cfacdc89225ac3273c432a39af63
 2022-10-11 01:50:25 +00:00
TreeHugger Robot
539fea38c2 Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 am: 676cefb0ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545

Change-Id: I7a377d2787cb077e3d717558da0b21e297699112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-08 12:36:21 +00: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
Daniel Norman
e1f343acde 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:34 +00:00
Hao Ke
ac02d51ea3 Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev am: 459808b2c0 am: 64e4cbc1d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105519

Change-Id: I8ebe172f9d76d5b21e3beb0f99b36189511fc71e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 20:05:33 +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
Rhed Jao
886fab1952 [automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into qt-dev am: 4727daddff am: 806167eda3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6acb4026cb6b949dd5158a84274fe539306480cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 01:10:04 +00:00
Rhed Jao
0de1dbc4f4 [automerger skipped] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 4d13148a3f am: cd6e9585b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f13363fb41ece156b858755174244cc875d5099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 01:09:40 +00:00
Rhed Jao
806167eda3 Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into qt-dev am: 4727daddff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061305

Change-Id: I8657b8b6d1f46889a61d9ecd4af6e834df4ba544
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 00:43:47 +00:00
Rhed Jao
cd6e9585b9 [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 4d13148a3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061305

Change-Id: I717dc0210b91048ac79afb2ef0d22dc9a266802f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-05 00:43:40 +00:00
Rhed Jao
4727daddff Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into qt-dev 2022-10-05 00:12:20 +00:00
Rhed Jao
32a7d30650 Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into rvc-dev 2022-10-05 00:12:02 +00:00
Hao Ke
eb9a0566a5 Add safety checks on KEY_INTENT mismatch. 
For many years, Parcel mismatch typed exploits has been using the
AccoungManagerService's passing of KEY_INTENT workflow, as a foothold of
launching arbitrary intents. We are adding an extra check on the service
side to simulate the final deserialization of the KEY_INTENT value, to
make sure the client side won't get a mismatched KEY_INTENT value.

Bug: 250588548
Bug: 240138294
Test: atest CtsAccountManagerTestCases
Test: local test, also see b/250588548
Change-Id: I433e34f6e21ce15c89825044a15b1dec46bb25cc
 2022-10-04 22:07:34 +00:00