Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
652,110 Commits 3 Branches 0 Tags
38ea9c71c0afedaf00622e1ab4ddc3b54d3d1be8
Commit Graph

652110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Song Chun Fan
38ea9c71c0 [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: 9316713ba4 -s ours 
am skip reason: subject contains skip directive

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

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

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

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

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

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

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

Change-Id: I471a1627399a9557b4c1764c7687433d9ddf3e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-19 00:26:43 +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
Song Chun Fan
0955d92a0f [automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into rvc-dev am: 43c9711338 -s ours 
am skip reason: Merged-In I20551a2dba9aa79efa0c064824f349f551c2c2e4 with SHA-1 3c2723ffaf is already in history

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

Change-Id: I81f62d4067fb78fea0907c525841427c99fc548e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 23:41:18 +00:00
Songchun Fan
5e31a6c1cf [automerger skipped] [RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated am: f22267f8b2 -s ours 
am skip reason: Merged-In I20551a2dba9aa79efa0c064824f349f551c2c2e4 with SHA-1 3c2723ffaf is already in history

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

Change-Id: Ic78f0278327010e8e15ce4feac5a3aaa5d9fdfad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 23:41:01 +00:00
Song Chun Fan
b66bf1e630 Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into sc-qpr1-dev 2022-10-18 23:33:06 +00:00
Yuri Lin
7a135016ee [automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into sc-dev am: 67168d886a -s ours 
am skip reason: Merged-In Iae423d93b777df8946ecf1c3baf640fcf74990ec with SHA-1 4ed0f171be is already in history

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

Change-Id: If8eb4fd8b4b03a8c51ed8f1d3c503a27f790d85b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 23:25:58 +00:00
Yuri Lin
856f177e1e [automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 7533d0420d -s ours 
am skip reason: Merged-In Iae423d93b777df8946ecf1c3baf640fcf74990ec with SHA-1 4ed0f171be is already in history

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

Change-Id: I5f551c1c47a10bdea1ed1683fca0dfe29cda0e12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 23:25:49 +00:00
Yuri Lin
22f3caeea7 [automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into qt-dev am: 600ecb01d0 am: f663191969 -s ours am: 31b5a32547 -s ours am: 2b0f37f228 -s ours am: 52b02cb87c -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I5aeb888d7bad432dd1126e2ffab470319d3a3e24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 23:25:26 +00:00
Yuri Lin
67168d886a Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into sc-dev 2022-10-18 23:23:29 +00:00
Song Chun Fan
fec4943a78 Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into rvc-qpr-dev 2022-10-18 23:17:28 +00: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
52b02cb87c [automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into qt-dev am: 600ecb01d0 am: f663191969 -s ours am: 31b5a32547 -s ours am: 2b0f37f228 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: Idc061c594b456f2e6edd6d637cd33f90f27cfcaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 22:55:14 +00:00
Yuri Lin
2b0f37f228 [automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into qt-dev am: 600ecb01d0 am: f663191969 -s ours am: 31b5a32547 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: If4e85b0eee3283891b375ff3a4b7f7612d68522d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 22:25:01 +00:00
Yuri Lin
5e10708a3a [automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into rvc-dev am: 209b83712b -s ours am: 54e734e801 -s ours am: f694583feb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4d4a411b81d80cf74e9fcb74bb1771222c89a0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:56:12 +00:00
Yuri Lin
40e1c366cb [automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 83d23fb275 -s ours am: 8ac57015f3 -s ours am: 36e633cea9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb1d5b5a7681865e8d0f9a36482266045c12e8ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:56:02 +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
bc48ffae78 [automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into rvc-qpr-dev am: 1123e29a83 -s ours am: 5439a348b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I615af4b9502350629eba03a5db9c7cd5f97f8779
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:55:46 +00:00
Yuri Lin
25e290d0f0 [automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 313a84f033 -s ours am: 767ca22ca0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id8c65e2c30afef9c1e8b5ad9cd801c2c8f1a9e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:55:44 +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
f694583feb [automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into rvc-dev am: 209b83712b -s ours am: 54e734e801 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82848fc7f198d12209bcb93c592437d084c58255
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:26:13 +00:00
Yuri Lin
36e633cea9 [automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 83d23fb275 -s ours am: 8ac57015f3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If87a3cd68e7f23486833b8cf7ed3ab98a411f852
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:25:59 +00:00
Yuri Lin
5439a348b9 [automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into rvc-qpr-dev am: 1123e29a83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae926bed8cda601c808cb1721a342e09553bb937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:25:33 +00:00
Yuri Lin
54e734e801 [automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into rvc-dev am: 209b83712b -s ours 
am skip reason: Merged-In Iae423d93b777df8946ecf1c3baf640fcf74990ec with SHA-1 313a84f033 is already in history

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

Change-Id: I0df772a814a192a584404e702068563f2c6f9311
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:25:32 +00:00
Yuri Lin
8ac57015f3 [automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 83d23fb275 -s ours 
am skip reason: Merged-In Iae423d93b777df8946ecf1c3baf640fcf74990ec with SHA-1 313a84f033 is already in history

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

Change-Id: I13032b6aeaaf1d785ade1b292ee8abe8691de37d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:25:18 +00:00
Yuri Lin
767ca22ca0 [automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 313a84f033 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I60f6d549dc2f07966a97ea0295cfac585f084f10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:25:17 +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
Yuri Lin
1123e29a83 Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into rvc-qpr-dev 2022-10-18 21:06:19 +00:00
Yuri Lin
bafc7d40df Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into sc-qpr1-dev 2022-10-18 21:04:21 +00:00
Songchun Fan
a8f756f989 [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:29:10 +00:00
Songchun Fan
3c2723ffaf [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:45 +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
4ed0f171be [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:31:22 +00:00
Yuri Lin
7533d0420d [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:31:12 +00:00
Yuri Lin
313a84f033 [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:31:01 +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
13d2037a7a [automerger skipped] Merge "RESTRICT AUTOMERGE Disable all A11yServices from an uninstalled package." into qt-dev am: dc0095e9e4 am: 49cd9427ef -s ours am: 822eef4399 -s ours am: 1d2c073e40 -s ours am: 9142d8c936 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: Ibbf49985abe9495ced1332f2bb492b583ce83a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 22:07:03 +00:00