Commit Graph

781115 Commits

Author SHA1 Message Date
Treehugger Robot
df0e997103 Merge "Expand ownership to all package manager owners" am: b63b381eb1 am: f069df3de6 am: ddd4db1ab9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2227757

Change-Id: I213383c85726c55c1ea604b28605b8822ef8a562
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 20:02:31 +00:00
Automerger Merge Worker
979cdb81d3 Merge "Merge "Fix NPE" into tm-dev am: 2b38dbd41b am: 22d21f296a" into tm-d1-dev-plus-aosp 2022-09-22 20:01:50 +00:00
Julia Reynolds
fdefc822bd Merge "Fix NPE" into tm-dev am: 2b38dbd41b am: 1218e5f899
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886853

Change-Id: I53b04e34d84003a88f5a212c734f1a00e6a05b66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 20:01:34 +00:00
Julia Reynolds
372146fcce Merge "Fix NPE" into tm-dev am: 2b38dbd41b am: 22d21f296a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886853

Change-Id: I5124508b58632ca9e98f5c3de6bceb793f9ba118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 20:01:31 +00:00
Julia Reynolds
22d21f296a Merge "Fix NPE" into tm-dev am: 2b38dbd41b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886853

Change-Id: I97dc2411d3c949a1b456adcc033b20f73c306160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:33:49 +00:00
Treehugger Robot
ddd4db1ab9 Merge "Expand ownership to all package manager owners" am: b63b381eb1 am: f069df3de6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2227757

Change-Id: I434fd198ef58f04b21d0c67a028777769f6edc59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:29:32 +00:00
Julia Reynolds
1218e5f899 Merge "Fix NPE" into tm-dev am: 2b38dbd41b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886853

Change-Id: I33adc2a3b2b7863c6b97964c1d1e6f0820f56faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:29:00 +00:00
Julia Tuttle
4e6e056248 Merge "New Pipeline: hide VISIBILITY_SECRET notifications on lock screen" into tm-dev am: ecc34caee3 am: a40fdb0cea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19755224

Change-Id: I78a253ae48bbd4d8af5b64fe5334e698227e0855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:10:48 +00:00
Automerger Merge Worker
d4768de537 Merge changes from topic "am-f4fda1f5a74c40ad8ce0d51611675f84" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-be77b49cb4954373beb6c8cf4e1baecc" into sc-qpr1-dev am: 2529e2dbab -s ours am: 1beb11d58b -s ours am: 1140d5bb61 -s ours am: 6ca3a83161 -s ours
  [automerger skipped] [automerge] Fix NPE 2p: e51c402650 am: 89439d1cbc -s ours am: de299cab0f -s ours am: 95d5f3fd64 -s ours am: cf14381d13 -s ours
2022-09-22 19:09:55 +00:00
TreeHugger Robot
ce64d0baa2 [automerger skipped] Merge changes from topic "presubmit-am-be77b49cb4954373beb6c8cf4e1baecc" into sc-qpr1-dev am: 2529e2dbab -s ours am: 1beb11d58b -s ours am: 1140d5bb61 -s ours am: 6ca3a83161 -s ours
am skip reason: Merged-In I9c681106f6d645e62b0e44903d40aa523fee0e95 with SHA-1 c23f14f874 is already in history

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

Change-Id: I6179f03a29db1e13c4794ae2fb3dd6b773e06efd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:09:45 +00:00
Automerger Merge Worker
40edc18d1b Merge "Merge "New Pipeline: hide VISIBILITY_SECRET notifications on lock screen" into tm-dev am: ecc34caee3 am: 304a52c81e" into tm-d1-dev-plus-aosp 2022-09-22 19:09:33 +00:00
Presubmit Automerger Backend
c200917418 [automerger skipped] [automerge] Fix NPE 2p: e51c402650 am: 89439d1cbc -s ours am: de299cab0f -s ours am: 95d5f3fd64 -s ours am: cf14381d13 -s ours
am skip reason: Merged-In I9c681106f6d645e62b0e44903d40aa523fee0e95 with SHA-1 c23f14f874 is already in history

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

Change-Id: I9c0c3b4126e84c25b2190fd333fcacf5f7958887
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:09:30 +00:00
Julia Tuttle
bd5ebc5566 Merge "New Pipeline: hide VISIBILITY_SECRET notifications on lock screen" into tm-dev am: ecc34caee3 am: 304a52c81e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19755224

Change-Id: I4d91db22b8363ef631aa2e111246d90a74db5915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:09:12 +00:00
Julia Reynolds
a055e22aa6 Merge "Fix NPE" into sc-qpr1-dev am: de9a9c9fa9 am: 7b845f1042 am: d315618ff2 am: 9267d1f106
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886856

Change-Id: I935dbb15d28de500db39ddd837d453201b78b4e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:09:04 +00:00
Automerger Merge Worker
3b5a6e1ba7 Merge changes from topic "am-4c397c3fdf114020970b081e27d88ddf" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-be77b49cb4954373beb6c8cf4e1baecc" into sc-qpr1-dev am: 2529e2dbab -s ours am: 1beb11d58b -s ours am: 1140d5bb61 -s ours am: 5a7e9eb741 -s ours
  [automerger skipped] [automerge] Fix NPE 2p: e51c402650 am: 89439d1cbc -s ours am: de299cab0f -s ours am: 95d5f3fd64 -s ours am: ca6a8d29e7 -s ours
2022-09-22 19:08:57 +00:00
TreeHugger Robot
b77e152009 [automerger skipped] Merge changes from topic "presubmit-am-be77b49cb4954373beb6c8cf4e1baecc" into sc-qpr1-dev am: 2529e2dbab -s ours am: 1beb11d58b -s ours am: 1140d5bb61 -s ours am: 5a7e9eb741 -s ours
am skip reason: Merged-In I9c681106f6d645e62b0e44903d40aa523fee0e95 with SHA-1 c23f14f874 is already in history

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

Change-Id: I4681ba43b4b9c52038568fc4e55894d89d108517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:08:48 +00:00
Automerger Merge Worker
8c61accea7 Merge changes from topic "am-1ccfe4290bf0448cbf44ff4432cc79f4" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into rvc-dev am: 415d288b12 -s ours am: ddc6b55463 -s ours am: 9dea976c80 -s ours am: 18b663d432 -s ours am: 03309c8a3b -s ours am: 4c4c0eda02 -s ours am: 9e7a4662a1 -s ours
  [automerger skipped] Limit lengths of fields in Condition to a max length. am: 80c0fcf06d -s ours am: e1fab0c8b4 -s ours am: b16139a468 -s ours am: 6d91d8437e -s ours am: fc0dfba029 -s ours am: 5929d96101 -s ours am: f317025fc8 -s ours
2022-09-22 19:08:47 +00:00
Presubmit Automerger Backend
45738dbd40 [automerger skipped] [automerge] Fix NPE 2p: e51c402650 am: 89439d1cbc -s ours am: de299cab0f -s ours am: 95d5f3fd64 -s ours am: ca6a8d29e7 -s ours
am skip reason: Merged-In I9c681106f6d645e62b0e44903d40aa523fee0e95 with SHA-1 c23f14f874 is already in history

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

Change-Id: I2ba55b77f68fe0ba6b3199c863e03fab36f243b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:08:42 +00:00
Yuri Lin
cfacc4ec54 [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into rvc-dev am: 415d288b12 -s ours am: ddc6b55463 -s ours am: 9dea976c80 -s ours am: 18b663d432 -s ours am: 03309c8a3b -s ours am: 4c4c0eda02 -s ours am: 9e7a4662a1 -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 d0839c4aaf is already in history

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

Change-Id: I5100acd4d9f83fe0d1d4576064b74c1b6edef677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:08:35 +00:00
Yuri Lin
cbed744b45 [automerger skipped] Limit lengths of fields in Condition to a max length. am: 80c0fcf06d -s ours am: e1fab0c8b4 -s ours am: b16139a468 -s ours am: 6d91d8437e -s ours am: fc0dfba029 -s ours am: 5929d96101 -s ours am: f317025fc8 -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 d0839c4aaf is already in history

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

Change-Id: I4fc815da4152cb22c5af92f735d80057811ed515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:08:27 +00:00
Julia Reynolds
97f21b485a Merge "Fix NPE" into sc-qpr1-dev am: de9a9c9fa9 am: 7b845f1042 am: d315618ff2 am: 229c635034
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886856

Change-Id: Iac9cbf74f987408d1e870a9618252c192e26cafe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:08:16 +00:00
Automerger Merge Worker
e7bcc47e68 Merge changes from topic "am-2c16bf37383c453a942af19dc474b937" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into rvc-dev am: 415d288b12 -s ours am: ddc6b55463 -s ours am: 9dea976c80 -s ours am: 18b663d432 -s ours am: 03309c8a3b -s ours am: 4c4c0eda02 -s ours am: 63aa497edb -s ours
  [automerger skipped] Limit lengths of fields in Condition to a max length. am: 80c0fcf06d -s ours am: e1fab0c8b4 -s ours am: b16139a468 -s ours am: 6d91d8437e -s ours am: fc0dfba029 -s ours am: 5929d96101 -s ours am: c695f9cddf -s ours
2022-09-22 19:08:00 +00:00
Yuri Lin
23488ddc43 [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into rvc-qpr-dev am: 9f4f12be76 -s ours am: 682623d8e3 -s ours am: dabc71fd79 -s ours am: 6905193b9b -s ours am: 63d17ad784 -s ours am: 7c06a370f8 -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 7059638be9 is already in history

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

Change-Id: Ifc54d3d650e6f0f6893766d66194821e98de52ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:07:47 +00:00
Yuri Lin
ce3d83f095 [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into rvc-dev am: 415d288b12 -s ours am: ddc6b55463 -s ours am: 9dea976c80 -s ours am: 18b663d432 -s ours am: 03309c8a3b -s ours am: 4c4c0eda02 -s ours am: 63aa497edb -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 d0839c4aaf is already in history

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

Change-Id: I28f5b1cd06af7747f59c98f06bf9dd8db74ea706
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:07:45 +00:00
Yuri Lin
775eaf1ce1 [automerger skipped] Limit lengths of fields in Condition to a max length. am: d0839c4aaf -s ours am: 1126069249 -s ours am: d077483545 -s ours am: 4e877d0214 -s ours am: dc8ffd7b96 -s ours am: 3cca2a970d -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 7059638be9 is already in history

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

Change-Id: I4c34ffc03f55fd616e80700e01d92fb4c47da7d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:07:32 +00:00
Yuri Lin
97db08169e [automerger skipped] Limit lengths of fields in Condition to a max length. am: 80c0fcf06d -s ours am: e1fab0c8b4 -s ours am: b16139a468 -s ours am: 6d91d8437e -s ours am: fc0dfba029 -s ours am: 5929d96101 -s ours am: c695f9cddf -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 d0839c4aaf is already in history

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

Change-Id: I1a5bbb7cccb8ae82777cbf97945c72535faa7e7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:07:14 +00:00
Yuri Lin
3d1dc814ee [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into rvc-qpr-dev am: 9f4f12be76 -s ours am: 682623d8e3 -s ours am: dabc71fd79 -s ours am: 6905193b9b -s ours am: 63d17ad784 -s ours am: effa604f18 -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 7059638be9 is already in history

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

Change-Id: I6126c92db6744fa5ee4e9387c984d854d0f849fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:06:41 +00:00
Yuri Lin
2bce6931ce [automerger skipped] Limit lengths of fields in Condition to a max length. am: d0839c4aaf -s ours am: 1126069249 -s ours am: d077483545 -s ours am: 4e877d0214 -s ours am: dc8ffd7b96 -s ours am: e2be5b3e15 -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 7059638be9 is already in history

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

Change-Id: Ie972552aa0bf383bed2ad1f29b4db68a72594eda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:06:35 +00:00
Julia Reynolds
633bb785ed Merge "Fix NPE" into sc-v2-dev am: 70cc3c99d3 am: 1cdad7c9ae am: 21bb24fa44
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886854

Change-Id: Id6dd42e73c5406d53b064026df2bcade0629766c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:06:12 +00:00
Treehugger Robot
f069df3de6 Merge "Expand ownership to all package manager owners" am: b63b381eb1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2227757

Change-Id: Iab0b2791f9e07003ac5e61d680cdf3ea108a2153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:37:24 +00:00
Julia Reynolds
2b38dbd41b Merge "Fix NPE" into tm-dev 2022-09-22 18:36:42 +00:00
Julia Tuttle
304a52c81e Merge "New Pipeline: hide VISIBILITY_SECRET notifications on lock screen" into tm-dev am: ecc34caee3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19755224

Change-Id: I52009eb83857640105fff11b4c559b33479fbc29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:17:00 +00:00
TreeHugger Robot
5a7e9eb741 [automerger skipped] Merge changes from topic "presubmit-am-be77b49cb4954373beb6c8cf4e1baecc" into sc-qpr1-dev am: 2529e2dbab -s ours am: 1beb11d58b -s ours am: 1140d5bb61 -s ours
am skip reason: Merged-In I9c681106f6d645e62b0e44903d40aa523fee0e95 with SHA-1 c23f14f874 is already in history

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

Change-Id: Id813972041f18b020811439805b40b91f7560221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:16:43 +00:00
Presubmit Automerger Backend
ca6a8d29e7 [automerger skipped] [automerge] Fix NPE 2p: e51c402650 am: 89439d1cbc -s ours am: de299cab0f -s ours am: 95d5f3fd64 -s ours
am skip reason: Merged-In I9c681106f6d645e62b0e44903d40aa523fee0e95 with SHA-1 c23f14f874 is already in history

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

Change-Id: I58f124b78bcba085d138f342b021296e08c2ac1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:16:42 +00:00
Julia Reynolds
229c635034 Merge "Fix NPE" into sc-qpr1-dev am: de9a9c9fa9 am: 7b845f1042 am: d315618ff2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886856

Change-Id: I74edebe73f0ed76aca1a116473c279b64b286ca2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:16:09 +00:00
Julia Tuttle
a40fdb0cea Merge "New Pipeline: hide VISIBILITY_SECRET notifications on lock screen" into tm-dev am: ecc34caee3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19755224

Change-Id: Icf1ecae347d3227674914f2f53f87c4e919f0c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:15:40 +00:00
Yuri Lin
63aa497edb [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into rvc-dev am: 415d288b12 -s ours am: ddc6b55463 -s ours am: 9dea976c80 -s ours am: 18b663d432 -s ours am: 03309c8a3b -s ours am: 4c4c0eda02 -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 d0839c4aaf is already in history

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

Change-Id: Ia3c254659385f46b9d57aa359439cd9ea57d2927
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:15:40 +00:00
Yuri Lin
c695f9cddf [automerger skipped] Limit lengths of fields in Condition to a max length. am: 80c0fcf06d -s ours am: e1fab0c8b4 -s ours am: b16139a468 -s ours am: 6d91d8437e -s ours am: fc0dfba029 -s ours am: 5929d96101 -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 d0839c4aaf is already in history

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

Change-Id: I37631fafa8ebcae28bc8babc5e5dcfbf92904f3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:15:38 +00:00
Yuri Lin
effa604f18 [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into rvc-qpr-dev am: 9f4f12be76 -s ours am: 682623d8e3 -s ours am: dabc71fd79 -s ours am: 6905193b9b -s ours am: 63d17ad784 -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 7059638be9 is already in history

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

Change-Id: Ic1132c6e9e6ce7339cd4b86a277308d21e4a52f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:15:22 +00:00
TreeHugger Robot
6ca3a83161 [automerger skipped] Merge changes from topic "presubmit-am-be77b49cb4954373beb6c8cf4e1baecc" into sc-qpr1-dev am: 2529e2dbab -s ours am: 1beb11d58b -s ours am: 1140d5bb61 -s ours
am skip reason: Merged-In I9c681106f6d645e62b0e44903d40aa523fee0e95 with SHA-1 c23f14f874 is already in history

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

Change-Id: I290c814e3a91c9e32bbb591a367e3b0f727703ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:15:20 +00:00
Yuri Lin
e2be5b3e15 [automerger skipped] Limit lengths of fields in Condition to a max length. am: d0839c4aaf -s ours am: 1126069249 -s ours am: d077483545 -s ours am: 4e877d0214 -s ours am: dc8ffd7b96 -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 7059638be9 is already in history

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

Change-Id: I4a2de3575738137c307beda81c285627a284a1f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:15:20 +00:00
Presubmit Automerger Backend
cf14381d13 [automerger skipped] [automerge] Fix NPE 2p: e51c402650 am: 89439d1cbc -s ours am: de299cab0f -s ours am: 95d5f3fd64 -s ours
am skip reason: Merged-In I9c681106f6d645e62b0e44903d40aa523fee0e95 with SHA-1 c23f14f874 is already in history

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

Change-Id: Ibefbde18e87a81bed4bef10bff8a87432ab615ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:15:13 +00:00
Julia Reynolds
9267d1f106 Merge "Fix NPE" into sc-qpr1-dev am: de9a9c9fa9 am: 7b845f1042 am: d315618ff2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886856

Change-Id: I06ebe6984e3991ddcd979dbd5733f2a9d9693883
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:14:51 +00:00
Yuri Lin
9e7a4662a1 [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into rvc-dev am: 415d288b12 -s ours am: ddc6b55463 -s ours am: 9dea976c80 -s ours am: 18b663d432 -s ours am: 03309c8a3b -s ours am: 4c4c0eda02 -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 d0839c4aaf is already in history

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

Change-Id: I718f89ceae1b8d12cf628aa7b98849e45a4267db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:14:24 +00:00
Yuri Lin
f317025fc8 [automerger skipped] Limit lengths of fields in Condition to a max length. am: 80c0fcf06d -s ours am: e1fab0c8b4 -s ours am: b16139a468 -s ours am: 6d91d8437e -s ours am: fc0dfba029 -s ours am: 5929d96101 -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 d0839c4aaf is already in history

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

Change-Id: I9f95711fba0914c327298919b404b3016196b825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:14:06 +00:00
Yuri Lin
7c06a370f8 [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into rvc-qpr-dev am: 9f4f12be76 -s ours am: 682623d8e3 -s ours am: dabc71fd79 -s ours am: 6905193b9b -s ours am: 63d17ad784 -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 7059638be9 is already in history

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

Change-Id: I890ebac1248105eea263fa5d33d4c5fc2d89576e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:13:42 +00:00
Yuri Lin
3cca2a970d [automerger skipped] Limit lengths of fields in Condition to a max length. am: d0839c4aaf -s ours am: 1126069249 -s ours am: d077483545 -s ours am: 4e877d0214 -s ours am: dc8ffd7b96 -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 7059638be9 is already in history

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

Change-Id: Id8ed3636ca28ad9f48ce41462f59018bab7e693d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:13:31 +00:00
Julia Reynolds
21bb24fa44 Merge "Fix NPE" into sc-v2-dev am: 70cc3c99d3 am: 1cdad7c9ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886854

Change-Id: I242499c2f01c1b6453dc5291b79555a99a1fb846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:12:45 +00:00
Julia Tuttle
ecc34caee3 Merge "New Pipeline: hide VISIBILITY_SECRET notifications on lock screen" into tm-dev 2022-09-22 17:56:55 +00:00
TreeHugger Robot
1140d5bb61 [automerger skipped] Merge changes from topic "presubmit-am-be77b49cb4954373beb6c8cf4e1baecc" into sc-qpr1-dev am: 2529e2dbab -s ours am: 1beb11d58b -s ours
am skip reason: Merged-In I9c681106f6d645e62b0e44903d40aa523fee0e95 with SHA-1 c23f14f874 is already in history

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

Change-Id: I828008f64b925b90c6a22793ee8fbcd312b5b002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 17:50:50 +00:00