Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
650,012 Commits 3 Branches 0 Tags
1b7f3fbccc03ad98aae2da593c96d5985e560703
Commit Graph

650012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nate Myren
1b7f3fbccc [automerger skipped] RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..." am: 4e83e59b27 am: 4734edc494 -s ours am: 33e8d3d736 -s ours am: 3b64b27aab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83cab0216bce100fb0bf8451d9549c9c1481a944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-27 04:37:06 +00:00
Nate Myren
3b64b27aab [automerger skipped] RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..." am: 4e83e59b27 am: 4734edc494 -s ours am: 33e8d3d736 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2948ce87ee06912ac47371b40d816c2e65a0a22f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-27 04:02:38 +00:00
Nate Myren
33e8d3d736 [automerger skipped] RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..." am: 4e83e59b27 am: 4734edc494 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7035cfd7d3533effbd4c3e7cf63776cdafa8be72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-27 03:28:51 +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
David Saff
7185d7f108 Merge "Disable broken NotificationStackScrollLayoutTest on qt-dev" into qt-dev am: b4ac90f433 am: c5c6a916fe am: 7bed0ed812 am: 1eb5f3a92a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20281824

Change-Id: I3ef0db30c3ce8d36a8f795846d8605b90d574262
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-26 23:10:02 +00:00
David Saff
1eb5f3a92a Merge "Disable broken NotificationStackScrollLayoutTest on qt-dev" into qt-dev am: b4ac90f433 am: c5c6a916fe am: 7bed0ed812 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20281824

Change-Id: Ib34f38f4fb6b7838ffb6a1c9157be6b81b0e40e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-26 22:35:15 +00:00
David Saff
7bed0ed812 Merge "Disable broken NotificationStackScrollLayoutTest on qt-dev" into qt-dev am: b4ac90f433 am: c5c6a916fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20281824

Change-Id: I29a538c561610c9a4bd642fce18ab2688406e172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-26 21:43:43 +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
3051c06d1f [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Validate permission tree size on perm..."" into qt-dev am: f661f5e669 am: c17c5cb249 -s ours am: fecdde0e57 -s ours am: e370885445 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I54d2743a799572bf8d785980c2a736aca66cd775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-26 03:12:50 +00:00
Chris Sabotta
e370885445 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Validate permission tree size on perm..."" into qt-dev am: f661f5e669 am: c17c5cb249 -s ours am: fecdde0e57 -s ours 
am skip reason: subject contains skip directive

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

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

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

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

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

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

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

Change-Id: Ie8f2b00d8b943ab55babaf3a0c58392bb5c8285a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-25 22:16:59 +00:00
Nate Myren
5cd1e01215 [automerger skipped] Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into qt-dev am: 2d9de7b6ef am: 19a62f65cb -s ours am: 18ab349ff5 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: Ie4ff9e69fe836232179cabb1b1852a4505f9c609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-25 21:42:34 +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
d5b99bce20 [automerger skipped] Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into rvc-dev am: 4d96a79f54 am: 7ba3486814 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a42be568d38d9e0d6d86716cc6e96ec8a52d879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-25 19:05:54 +00:00
Nate Myren
87cacf726b [automerger skipped] RESTRICT AUTOMERGE Validate permission tree size on permission update am: 8fdf4530aa am: fa709cdfb4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iabc0a6e222bb22843bb9cc6593cb7050be4150fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-25 19:05:19 +00:00
Nate Myren
7ba3486814 Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into rvc-dev am: 4d96a79f54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20030687

Change-Id: Ibd929550fc3850c6348bb20659449a5c5922dd73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-25 18:31:37 +00:00
Nate Myren
fa709cdfb4 RESTRICT AUTOMERGE Validate permission tree size on permission update am: 8fdf4530aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20030687

Change-Id: If830fb0f3d226c0a5589ae52181e4398196d66a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-25 18:31:23 +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
Nate Myren
03f0146b3c Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into sc-dev 2022-10-25 16:27:22 +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
Winson Chung
967cdc5544 Merge "Backport missing permission check for querying main activity intent" into sc-dev 2022-10-19 22:20:07 +00:00
Nate Myren
1d86c8b299 RESTRICT AUTOMERGE Validate permission tree size on permission update 
Bug: 242537498
Test: manual
Change-Id: I15343e84c1802d6b89249106263319a6539fa73b
 2022-10-19 21:16:15 +00:00
Songchun Fan
08a80ad4fe [automerger skipped] [SettingsProvider] mem limit should be checked before settings are updated am: d85a428210 am: 8451db5766 -s ours am: 8a46d49bd4 -s ours am: cf56315da1 -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: Ic9aab4e518987bd566329319a7bef3a6afee8101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-19 20:15:56 +00:00
Songchun Fan
cf56315da1 [automerger skipped] [SettingsProvider] mem limit should be checked before settings are updated am: d85a428210 am: 8451db5766 -s ours am: 8a46d49bd4 -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: I20cb444c342861cdf1ae6776fb9e1624b1516571
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-19 19:46:33 +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
TreeHugger Robot
01effff444 Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into sc-dev 2022-10-19 01:47:29 +00:00
Song Chun Fan
9316713ba4 [automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into rvc-dev am: 43c9711338 -s ours am: 0955d92a0f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8de468783fd57baed9bfeff078e3dae1698b4ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 23:57:05 +00:00
Songchun Fan
526b2f9868 [automerger skipped] [RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated am: f22267f8b2 -s ours am: 5e31a6c1cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f28d6b7398708582d12b4a6c0637b7cf064c8eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 23:56:57 +00:00
Song Chun Fan
6c3388db3b [automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into rvc-qpr-dev am: fec4943a78 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65ab87a2939fcd76e3b671dfd9e204ddf0514528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 23:56:02 +00:00
Songchun Fan
23cceaa391 [automerger skipped] [RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated am: 3c2723ffaf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9140985252258d32f8aa1d17246d0bf5e5c59994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 23:55:37 +00:00