Commit Graph

777746 Commits

Author SHA1 Message Date
Songchun Fan
b48bd515f0 [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: 1aa0e5c843 -s ours am: f21dd8df61 -s ours am: f1f4bfeee0 -s ours am: 5ec5d7fd3c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibf3b807440acbc4ea02df9698d365a6cefdb6edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 02:32:49 +00:00
Song Chun Fan
e022b1db24 [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: 898ea3069d -s ours am: c3e202e52a -s ours am: 2fabff2d82 -s ours am: 1f93cdf8ba -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: I8e103a961298eae3f6f93157fc9072165b21e8b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 02:32:27 +00:00
Songchun Fan
5ec5d7fd3c [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: 1aa0e5c843 -s ours am: f21dd8df61 -s ours am: f1f4bfeee0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I83e61617f067a5b78463737f4c43cac1af0fb2f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 02:04:16 +00:00
Song Chun Fan
1f93cdf8ba [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: 898ea3069d -s ours am: c3e202e52a -s ours am: 2fabff2d82 -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: Iffa867a4fc4e47c42123f6ff2b747906d367e919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 02:03:47 +00:00
Songchun Fan
f1f4bfeee0 [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: 1aa0e5c843 -s ours am: f21dd8df61 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8b5402b7891799174ddde928d205c32bd19f29c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:29:44 +00:00
Song Chun Fan
2fabff2d82 [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: 898ea3069d -s ours am: c3e202e52a -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: I0843af7a7adb2264f42c74fb199250ca8bdfad54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:28:43 +00:00
Song Chun Fan
84e6a0f36c Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into tm-qpr-dev 2022-10-19 01:22:18 +00:00
Song Chun Fan
5ba7124e01 [automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into sc-qpr1-dev am: b66bf1e630 -s ours am: dcdb78835a -s ours am: ee89262670 -s ours am: 4132815cb0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia87140184661d1674f4a944794d48bf6eaaa1b6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:02:49 +00:00
Songchun Fan
d782a75025 [automerger skipped] [RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated am: a8f756f989 -s ours am: 51b71c9ac7 -s ours am: 7d8ddba233 -s ours am: 976842ac30 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02a2e696a7b4638088d1a4c4dd20b609fe0fc532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:02:47 +00:00
Yuri Lin
8b400211e0 [automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into sc-dev am: 67168d886a -s ours am: 7a135016ee -s ours am: 9c4b723ff5 -s ours am: ec04eb746f -s ours am: 14273efd99 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I549f78d9ef324ceb2d6e6a3a476a253d87b90c25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:02:33 +00:00
Yuri Lin
713ba2aec7 [automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 7533d0420d -s ours am: 856f177e1e -s ours am: 708f170d82 -s ours am: c75f54a8bb -s ours am: 3bd4888045 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieabefb0e8653965ed2c303afc0c4c0f2edb909af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:02:20 +00:00
Yuri Lin
305bdcef31 [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: 22f3caeea7 -s ours am: 3042eccc97 -s ours am: 1f11e0a932 -s ours am: 208c7fbee8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I86f1694c0035d9a29d9d650b2b60d8b6b12d1e12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:01:41 +00:00
Yuri Lin
0acdd85028 [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: 1f3685598a -s ours am: 13ef24a9d6 -s ours am: 9c0b84e8cc -s ours am: 954fa3b235 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I131cf6fb10b92a5c355423f4f3bd0ed1cd8d0f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:01:38 +00:00
Song Chun Fan
d007858951 [automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into sc-v2-dev am: 443d29b752 -s ours am: 5d30049f5a -s ours am: e3560bbd03 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icfe85288c303ab205e97fc207c7c29d28ce51bd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:01:24 +00:00
Songchun Fan
5a41c2155b [automerger skipped] [RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated am: a1e8e64e07 -s ours am: b663adefa6 -s ours am: ee36c3d861 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I59662870d70972f20fd741c5b100837cafc9ebf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:01:22 +00:00
Song Chun Fan
a92710727b Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into tm-dev am: 7293df1ee9 am: 01bccaa3dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20226664

Change-Id: I0cb37897bf47854d6c5b36e00d6b9d7a93411e11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:01:14 +00:00
Songchun Fan
03a62db61a [RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated am: de2ba563d7 am: d3378a107e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20226664

Change-Id: I2098548ff2ad9f33aede1d17e6c81bdd21692e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:01:05 +00:00
Song Chun Fan
4132815cb0 [automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into sc-qpr1-dev am: b66bf1e630 -s ours am: dcdb78835a -s ours am: ee89262670 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I21fb4ddf580e7f26745e524d5bbfef5dae4ff6a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:01:02 +00:00
Songchun Fan
976842ac30 [automerger skipped] [RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated am: a8f756f989 -s ours am: 51b71c9ac7 -s ours am: 7d8ddba233 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I214d648004b58a79fb0e9654346d8b744fbb65ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:00:59 +00:00
Yuri Lin
14273efd99 [automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into sc-dev am: 67168d886a -s ours am: 7a135016ee -s ours am: 9c4b723ff5 -s ours am: ec04eb746f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I09eb42f6ba1be3849db52fc79acc91dba367ed7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:00:49 +00:00
Yuri Lin
3bd4888045 [automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 7533d0420d -s ours am: 856f177e1e -s ours am: 708f170d82 -s ours am: c75f54a8bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie034744ac78c2b3ac627a780e6de4c7a0f251066
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:00:47 +00:00
Songchun Fan
f21dd8df61 [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: 1aa0e5c843 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I18737120038ac957252c48765cd65b9bc32e036c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:00:31 +00:00
Yuri Lin
208c7fbee8 [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: 22f3caeea7 -s ours am: 3042eccc97 -s ours am: 1f11e0a932 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia01e80d877c18519d96387dd6b4f3cad3bdec36a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:00:29 +00:00
Yuri Lin
954fa3b235 [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: 1f3685598a -s ours am: 13ef24a9d6 -s ours am: 9c0b84e8cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5ad96a686f3968c1df0854ad893fb2a972c3631e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:00:27 +00:00
Song Chun Fan
c3e202e52a [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: 898ea3069d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib3f93b3c8c49f6c6373f5a91f252829e58be69c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:00:18 +00:00
Song Chun Fan
e3560bbd03 [automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into sc-v2-dev am: 443d29b752 -s ours am: 5d30049f5a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2491a7e7c6236e14fb8623f3cd9712c4a1d16ed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:00:12 +00:00
Songchun Fan
ee36c3d861 [automerger skipped] [RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated am: a1e8e64e07 -s ours am: b663adefa6 -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: Id138226012667409dc02194e7290470eb50e3b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:00:05 +00:00
Song Chun Fan
ee89262670 [automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into sc-qpr1-dev am: b66bf1e630 -s ours am: dcdb78835a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ice51ae5b9bda18fc1d77211b2b8da415092f5822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 00:29:23 +00:00
Songchun Fan
7d8ddba233 [automerger skipped] [RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated am: a8f756f989 -s ours am: 51b71c9ac7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3174e167f38b5165967990b5cce3d8138c32c081
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 00:29:12 +00:00
Yuri Lin
ec04eb746f [automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into sc-dev am: 67168d886a -s ours am: 7a135016ee -s ours am: 9c4b723ff5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I78e724142ec7093e1d135d1c9eb618ac7ae60d4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 00:28:46 +00:00
Yuri Lin
c75f54a8bb [automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 7533d0420d -s ours am: 856f177e1e -s ours am: 708f170d82 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I18f7ec923de4564859452860b4585054cfdcc055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 00:28:34 +00:00
Yuri Lin
1f11e0a932 [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: 22f3caeea7 -s ours am: 3042eccc97 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib4ea0c78844b0437a78da874530e09b68aff0fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 00:28:07 +00:00
Yuri Lin
9c0b84e8cc [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: 1f3685598a -s ours am: 13ef24a9d6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I366911e53773cd8b43435145fe9e1d6498fe7913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 00:27:57 +00:00
Song Chun Fan
5d30049f5a [automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into sc-v2-dev am: 443d29b752 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idc2f323cc38fa133ca15c2e4f5af406b8f77142a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 00:27:02 +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
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
01bccaa3dc Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into tm-dev am: 7293df1ee9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20226664

Change-Id: I981e91a5a38cee5913d79390e4c0e5789be6ae2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 00:15:46 +00:00
Songchun Fan
d3378a107e [RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated am: de2ba563d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20226664

Change-Id: Iaf72ae49cec90616c103455935fdbbaa984735c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 00:15:43 +00:00
Song Chun Fan
dcdb78835a [automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into sc-qpr1-dev am: b66bf1e630 -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: I5c696455ab6de16474e3e2802950b363f5c9f406
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 23:59:38 +00:00
Yuri Lin
9c4b723ff5 [automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into sc-dev am: 67168d886a -s ours am: 7a135016ee -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3353e71eaca983f6cf2657ec319952a29b71b7f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 23:59:27 +00:00
Yuri Lin
6e55918f41 [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: ddd4c894fc -s ours am: c4233d8d82 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2dd2fdab3c3285b723492cc371d607b8ced6acff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 23:59:26 +00:00
Yuri Lin
708f170d82 [automerger skipped] [DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule am: 7533d0420d -s ours am: 856f177e1e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie2aeb7750f2d08c40607d8cebb419e42e59c603e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 23:59:25 +00:00
Yuri Lin
64d7883ce2 [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: ed293f2473 -s ours am: 531728011b -s ours
am skip reason: subject contains skip directive

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

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