Commit Graph

800866 Commits

Author SHA1 Message Date
Automerger Merge Worker
ac0c238e4b Merge changes from topic "am-4c397c3fdf114020970b081e27d88ddf" into tm-d1-dev-plus-aosp am: 3b5a6e1ba7 -s ours
am skip reason: Merged-In I9c681106f6d645e62b0e44903d40aa523fee0e95 with SHA-1 e51c402650 is already in history

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

Change-Id: I9289a5e9876972e96de1e84c037596c9702a57b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 20:07:48 +00:00
TreeHugger Robot
efc6bfd905 [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: b77e152009 -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: I3c3a08374537c2d4c5d654671d1f814c24740cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 20:07:32 +00:00
Automerger Merge Worker
dfd99c47e8 Merge changes from topic "am-1ccfe4290bf0448cbf44ff4432cc79f4" into tm-d1-dev-plus-aosp am: 8c61accea7 -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 80c0fcf06d is already in history

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

Change-Id: I64e3d018d283a5877d3aa95901a2b1f204f0081a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 20:06:14 +00:00
Yuri Lin
fb9b226ff3 [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: cfacc4ec54 -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: I4277eb4c94113c7c1ee98477d6542a582289c588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 20:05:53 +00:00
Julia Reynolds
134acbadb2 Merge "Fix NPE" into sc-qpr1-dev am: de9a9c9fa9 am: 7b845f1042 am: d315618ff2 am: 229c635034 am: 97f21b485a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886856

Change-Id: Ieef83c79792f6b5cba30118c5f14d3801527a9db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 20:04:53 +00:00
Automerger Merge Worker
b77df433e3 Merge changes from topic "am-2c16bf37383c453a942af19dc474b937" into tm-d1-dev-plus-aosp am: e7bcc47e68 -s ours
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 80c0fcf06d is already in history

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

Change-Id: Ic779310ebf33d9f5cd84a41797645b7addf9c8c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 20:04:11 +00:00
Yuri Lin
c7c0ae5760 [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: ce3d83f095 -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: Ief35f614eebb7994e0cb5d74605015df8aa294e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 20:04:03 +00:00
Yuri Lin
61815fd850 [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: 23488ddc43 -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: Ic042b9c4ae3b25a147673cf39cf19369f10a7b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 20:03:14 +00:00
Yuri Lin
bd2950671f [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: 775eaf1ce1 -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: I9f3b474ee900ebad9b4e3bda760aec9c9f976668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 20:03:09 +00:00
Yuri Lin
8964e6d68f [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: 3d1dc814ee -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: Ie78b7d26b2e2756c1bf9e923d5d4ec19722e5095
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 20:00:45 +00:00
Yuri Lin
92be9d17a3 [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: 2bce6931ce -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: I39a8b545b8d5350019c40039f7d6075990759c4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 20:00:25 +00:00
Julia Reynolds
e57301c87e Merge "Fix NPE" into sc-v2-dev am: 70cc3c99d3 am: 1cdad7c9ae am: 21bb24fa44 am: 633bb785ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886854

Change-Id: I49810de77ea83398de439a7d1eb75de5102335e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:45:08 +00:00
Miranda Kephart
2584f20d58 Merge changes Iffb62170,I9b795928 into tm-qpr-dev am: 4658046b52
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20007505

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

Change-Id: I4217f4b139160335f0d0c68c01a7c42cbd9b849f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:30:50 +00:00
TreeHugger Robot
71a7df5870 [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: 3acd07ba54 -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: I0313b237dee26d2fd7ff0a98256521941c41a412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:30:03 +00:00
Presubmit Automerger Backend
be1eb293e2 [automerger skipped] [automerge] Fix NPE 2p: e51c402650 am: 89439d1cbc -s ours am: de299cab0f -s ours am: 95d5f3fd64 -s ours am: ca6a8d29e7 -s ours am: 09c8df286c -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: Ib0017ffd651290b8d8ce739d5dbca233a09e3fc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:29:33 +00:00
Miranda Kephart
4658046b52 Merge changes Iffb62170,I9b795928 into tm-qpr-dev
* changes:
  Clean up leaked screenshot connections
  Always reset screenshot preview to alpha=1
2022-09-22 19:13:56 +00:00
Julia Tuttle
dc3bd36318 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: I333e66aec9221790c61b71a5afb1a4320271718a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:09:12 +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
TreeHugger Robot
3acd07ba54 [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: Id59e1ca7658a4f248b839481c5d6d8c1ab165478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:08:19 +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
Presubmit Automerger Backend
09c8df286c [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: I15f617d598e2ae6adfcb98d46f6765946a89d531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:08:06 +00:00
Julia Reynolds
b271dda8b2 Merge "Fix NPE" into sc-qpr1-dev am: de9a9c9fa9 am: 7b845f1042 am: d315618ff2 am: 229c635034 am: b63311efab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886856

Change-Id: I5df8d4d973ea55e5884d44c3be9665d07977c722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:08:03 +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
cf99871e46 [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: 8da72db2ef -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: Ic2158f5c292bec1004064f62e41d4e72d05ffd6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:07:31 +00:00
Yuri Lin
739339bea5 [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: c56dc16bd8 -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: I68a6d666bf5147135172a633119ff84e17981733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:07:25 +00:00
Julia Reynolds
b63311efab 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: I7075bc2bc3f704f5e419aa8977efb82dfa5e76f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:07:22 +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
537f74b4b4 [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: e19cb84c78 -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: Ib4f5b723ef64a4d3a561257258450c1c9965b51b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:07:03 +00:00
Yuri Lin
3655a763cf [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: f89df891da -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: I380824b006c87df1b1c4b0b34dae6750fe6ad991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:06:51 +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
Yuri Lin
8da72db2ef [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: I6b569f45074b0a97caabc8da51956c4f00a7a1fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:06:32 +00:00
Yuri Lin
c56dc16bd8 [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: I28d6d5e0a3671f5b84a4a845f403ec62286b9058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:06:30 +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
Yuri Lin
e19cb84c78 [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: If85d887625370270e16c3bd1d8d9d9d30b9447fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:06:05 +00:00
Riddle Hsu
defe5d3eeb Merge "Allow to send user leave hint for task switch by touch" into tm-qpr-dev am: e0f07da153
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20008464

Change-Id: Id77a9fffb1ac33054e6d4116b0164431f0527d77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:06:00 +00:00
Yuri Lin
f89df891da [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: I98beaa4a2ff1a0f5e4d41492199efa7953b47fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:05:50 +00:00
Riddle Hsu
fd39c5f393 Merge "Skip syncing draw for non seamless rotation window" into tm-qpr-dev am: fd1f720d7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20000694

Change-Id: I314ee42aaa0eb8ebaa3cd24a60225f3861735a39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:03:28 +00:00
Riddle Hsu
e0f07da153 Merge "Allow to send user leave hint for task switch by touch" into tm-qpr-dev 2022-09-22 18:48:20 +00:00
Riddle Hsu
fd1f720d7d Merge "Skip syncing draw for non seamless rotation window" into tm-qpr-dev 2022-09-22 18:47:03 +00:00
TreeHugger Robot
71f56f17d6 Merge "DO NOT MERGE Return the preferred home activity first to honor persistent preferred activity." into tm-qpr-dev am: de1462654a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19997597

Change-Id: I2a52df7962a60118dfcc5c13ce483ea3d1b0a789
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:27:44 +00:00