Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
764,132 Commits 3 Branches 0 Tags
b663adefa6234f98fe3c8596920912eea8d4eb08
Commit Graph

764132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Songchun Fan
b663adefa6 [automerger skipped] [RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated am: a1e8e64e07 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icd823a739f1659d709e12dac16a160873c4a2fbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-19 00:26:26 +00:00
Song Chun Fan
7293df1ee9 Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into tm-dev 2022-10-18 23:54:02 +00:00
Yuri Lin
ddd4c894fc [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: 5e10708a3a -s ours am: 97bee2848c -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I331766c0b48cb61f6773cdd425ca9f312e9d83de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 22:56:14 +00:00
Yuri Lin
f9ebb55600 [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: bc48ffae78 -s ours am: 147834cc06 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I3a141dee0a551748b8044e3c5a22bae76d53a6f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 22:55:12 +00:00
Yuri Lin
97bee2848c [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: 5e10708a3a -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: Icabb24946ef04a4bfbbbb79d2d21c54ed6cc6bfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 22:28:51 +00:00
Yuri Lin
147834cc06 [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: bc48ffae78 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: Iba072a15870038d422f968a730c4cbcde7ce992c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 22:28:34 +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
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
15e1002bcb [automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into sc-qpr1-dev am: bafc7d40df -s ours am: d9e5df8f30 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99549ce9f8f5ede10d790cdd33b6f97e38975eb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:40:45 +00:00
Yuri Lin
4a1e52a3a0 [automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 4ed0f171be -s ours am: 2e073adf43 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaabc9cb954da5a490cad0c078399317d05620352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:40:10 +00:00
Yuri Lin
d9e5df8f30 [automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into sc-qpr1-dev am: bafc7d40df -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7d6a921910241fca6891403beeb126cefd4fdad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:29:01 +00:00
Yuri Lin
2e073adf43 [automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 4ed0f171be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1569a155c37c567d03c12d585f0015d30c69141b
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
7226d344ad [automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into sc-v2-dev am: 4f7306e796 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I733ca61e959574bcc7624d4aba7efbb0ab0de282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:25:41 +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
c8962de314 [automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 53d493b0e5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1985c651b44b744ac2f572434c79cb7eedad7581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:25:14 +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
Yuri Lin
4f7306e796 Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into sc-v2-dev 2022-10-18 21:04:07 +00:00
Songchun Fan
de2ba563d7 [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:32:19 +00:00
Songchun Fan
a1e8e64e07 [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:35 +00:00
Yuri Lin
53d493b0e5 [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
 2022-10-18 15:31:35 +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
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
Daniel Norman
d692cc2f66 [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: 13d2037a7a -s ours am: 869d90d0b2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3023efac503a953968948c6eb9fd3cda8a0f1728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 23:07:29 +00:00
Daniel Norman
6a7fbba890 [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: c03a507139 -s ours am: a2e16d219c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I857ffab2e4863d83df9a939f9dab9fa2aebdb561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 23:07:00 +00:00
Daniel Norman
869d90d0b2 [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: 13d2037a7a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3104195c9524fd0aac4db401fb6afe09ad02bda5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 22:40:01 +00:00
Daniel Norman
a2e16d219c [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: c03a507139 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81bae3511361861c75baa50231b88f5e56747cc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 22:39:44 +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
Daniel Norman
3e56f76fa2 Merge "Disable all A11yServices from an uninstalled package." into rvc-dev am: e6d10db58e am: 9e3a6a622a am: 994e8238bf am: 6f79c2effa am: f75b18a23e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20123964

Change-Id: I4673501e0ecb092baac388c1281ebd6b07de88a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 22:06:47 +00:00
Daniel Norman
f75b18a23e Merge "Disable all A11yServices from an uninstalled package." into rvc-dev am: e6d10db58e am: 9e3a6a622a am: 994e8238bf am: 6f79c2effa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20123964

Change-Id: Iacfa5277d2310c7fd0bb2106f63696a8783cbac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 21:39:52 +00:00
Daniel Norman
9142d8c936 [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 skip reason: subject contains skip directive

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

Change-Id: I1190671b4e3441f0efec130fce201fa18dcad86b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 21:36:58 +00:00
Daniel Norman
798fa14534 [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 skip reason: subject contains skip directive

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

Change-Id: I1dc1898590747bb3451fdfa14e1c184f8e9a6271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 21:36:28 +00:00
Daniel Norman
6f79c2effa Merge "Disable all A11yServices from an uninstalled package." into rvc-dev am: e6d10db58e am: 9e3a6a622a am: 994e8238bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20123964

Change-Id: I026bd0acac3ae0c967c11cbbcf349db4564e4508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 21:06:43 +00:00
Daniel Norman
1d2c073e40 [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 skip reason: subject contains skip directive

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

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

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

Change-Id: If3c89f34085153490133a8fdf688a8d7c89a6021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 21:05:32 +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