Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
781,047 Commits 3 Branches 0 Tags
775eaf1ce14d2bd4e747d8a60305733cf53bbe8a
Commit Graph

781047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Yuri Lin
63d17ad784 [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 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: I691dc3fc77faeb30927239cc04584ca60944365d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:47:59 +00:00
Yuri Lin
dc8ffd7b96 [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 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: If132c8698ce5acf1203d1f594fec9e653cc24cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:47:30 +00:00
Julia Reynolds
5f40892acc Merge "Fix NPE" into sc-v2-dev am: 70cc3c99d3 am: 1cdad7c9ae am: 812f10cff1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886854

Change-Id: I48578b4893887197cbeddd26524e5b63aa1a4cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:36:32 +00:00
Yuri Lin
7578305d4c [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into sc-dev am: 0a898cde81 -s ours am: 3234273e08 -s ours am: 7453d34f25 -s ours am: 27b2bc3af6 -s ours am: 104b14561e -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 14ceb8a5e7 is already in history

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

Change-Id: Ifa743b1b606b3cb8c1912b9bffac0709bb02d385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:36:08 +00:00
Yuri Lin
cdf6132b5e [automerger skipped] Limit lengths of fields in Condition to a max length. am: 7059638be9 -s ours am: 854748fd6a -s ours am: 3f11a77a82 -s ours am: dd014f1424 -s ours am: 5f5613cfc1 -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 14ceb8a5e7 is already in history

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

Change-Id: I78a9f8d7ec5e3b73eec3a7ccc1449cee3d13346d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:35:50 +00:00
Yuri Lin
110c8e0839 [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into sc-qpr1-dev am: b49fc187c4 -s ours am: 33a43d3cf3 -s ours am: bd54f1530e -s ours am: b08a0db2b5 -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 73ad3844ac is already in history

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

Change-Id: I9a5399da6e06c97dd52f57495f3b761a810bc7c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:35:22 +00:00
Yuri Lin
b1b32ce1ad [automerger skipped] Limit lengths of fields in Condition to a max length. am: 14ceb8a5e7 -s ours am: 8d431561be -s ours am: 313ee2e19a -s ours am: eef5afcbec -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 73ad3844ac is already in history

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

Change-Id: I9c1dd867c33faf99cbd4e50ffb74b624ae9f0a52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:35:02 +00:00
TreeHugger Robot
9ba4002f88 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bfc341d0c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica0d76c4842464372a1c04e3b29cbff6ef9e56c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:34:09 +00:00
Bill Yi
b093b07f51 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3786e5b6f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76e1dc78bba92be34e4613978adf0bda47c3c6b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:33:56 +00:00
TreeHugger Robot
db8f02f5ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0df5e46a09 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8970595ec0e67e7aa7172b3ff8d33f171f84094a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:33:40 +00:00
Bill Yi
d13e19f958 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1ee72c7edb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If00cb58d369207191b571a43a395da02d2e5e410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:33:34 +00:00
TreeHugger Robot
ca438bfbfe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ddce0b8d54 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f8f3d363f185cb331144be5bf30e9b824ee9561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:33:27 +00:00
Bill Yi
7d4600fea0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 95f68f9427 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iac08fe210c4551c5b7f95ff5f3a7908f75a264b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:33:16 +00:00
TreeHugger Robot
9fa1a14d01 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 55348e5a00 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3b34d5d779f81acf28b17d30bda0f1126fc146e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:32:48 +00:00
Bill Yi
eca019675b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6f80d59d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc92c0ecfbb822272bf6133d395cad492c3c1be4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:32:00 +00:00
Automerger Merge Worker
29ff243f52 Merge changes from topic "am-728b609d91cf47cca8425e67423cd568" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into sc-v2-dev am: 64a78c7a03 -s ours am: 2eec335061 -s ours am: 498398ffe2 -s ours
  [automerger skipped] Limit lengths of fields in Condition to a max length. am: 73ad3844ac -s ours am: 47be52441f -s ours am: aeb38a1676 -s ours
 2022-09-22 17:27:22 +00:00
Yuri Lin
45d3bb1a31 [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into sc-v2-dev am: 64a78c7a03 -s ours am: 2eec335061 -s ours am: 498398ffe2 -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 2a506d89f8 is already in history

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

Change-Id: I3d1b05cb2bf4984ec2db1eb89e7a24644381ff92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:26:55 +00:00
Yuri Lin
c2b0831f47 [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into sc-dev am: 0a898cde81 -s ours am: 3234273e08 -s ours am: 7453d34f25 -s ours am: 27b2bc3af6 -s ours am: 6e1c85dcca -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 14ceb8a5e7 is already in history

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

Change-Id: I02a95a1a31930a59683522aa47aea82e4df9e80f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:26:41 +00:00
Yuri Lin
d0700f331b [automerger skipped] Limit lengths of fields in Condition to a max length. am: 73ad3844ac -s ours am: 47be52441f -s ours am: aeb38a1676 -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 2a506d89f8 is already in history

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

Change-Id: I6ca39535a9647c44a135fa6190707cb8283c019d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:26:27 +00:00
Yuri Lin
f0dcda32d8 [automerger skipped] Limit lengths of fields in Condition to a max length. am: 7059638be9 -s ours am: 854748fd6a -s ours am: 3f11a77a82 -s ours am: dd014f1424 -s ours am: 09637ac2fb -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 14ceb8a5e7 is already in history

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

Change-Id: Ic86ba08d1839c8f3eea5b651d1dccf64b22bb50d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:26:24 +00:00
Automerger Merge Worker
ee18655533 Merge "[automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into tm-dev am: 4d62191383 am: 58b4652bbf -s ours" into tm-d1-dev-plus-aosp 2022-09-22 17:25:57 +00:00
Yuri Lin
eef6956ff3 [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into sc-qpr1-dev am: b49fc187c4 -s ours am: 33a43d3cf3 -s ours am: bd54f1530e -s ours am: 00d53f86bd -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 73ad3844ac is already in history

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

Change-Id: Idf4e76e987e6c552556575e0102b5170960b4dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:25:28 +00:00
Julia Reynolds
812f10cff1 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: I6f175a177d4dca48cd383782617cfbf975e58790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:25:27 +00:00
Yuri Lin
923402285e [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into tm-dev am: 4d62191383 am: 58b4652bbf -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 73ad3844ac is already in history

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

Change-Id: I7ec003d6d100c0fa549a8278d2baf9f44d7af258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:25:26 +00:00
Yuri Lin
d6576f1414 [automerger skipped] Limit lengths of fields in Condition to a max length. am: 14ceb8a5e7 -s ours am: 8d431561be -s ours am: 313ee2e19a -s ours am: 7d3035d29d -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 73ad3844ac is already in history

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

Change-Id: Iaff448bd1986e99e9d28e818b7ee52168039c4c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:25:16 +00:00
Yuri Lin
104b14561e [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into sc-dev am: 0a898cde81 -s ours am: 3234273e08 -s ours am: 7453d34f25 -s ours am: 27b2bc3af6 -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 14ceb8a5e7 is already in history

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

Change-Id: Ide76d1a60406b0326b515cb92d0949e1303644b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:24:56 +00:00
Yuri Lin
5f5613cfc1 [automerger skipped] Limit lengths of fields in Condition to a max length. am: 7059638be9 -s ours am: 854748fd6a -s ours am: 3f11a77a82 -s ours am: dd014f1424 -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 14ceb8a5e7 is already in history

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

Change-Id: Iab3a26fd818603594b783841f714de386c159530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:24:54 +00:00
Yuri Lin
6905193b9b [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 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: If77404f766f3bbb8bb0254d330fc651b4f46619b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:24:39 +00:00
Yuri Lin
b08a0db2b5 [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into sc-qpr1-dev am: b49fc187c4 -s ours am: 33a43d3cf3 -s ours am: bd54f1530e -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 73ad3844ac is already in history

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

Change-Id: I37e4a4f53ffb522af31816e08fa601ae77295e14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:24:39 +00:00
Yuri Lin
eef5afcbec [automerger skipped] Limit lengths of fields in Condition to a max length. am: 14ceb8a5e7 -s ours am: 8d431561be -s ours am: 313ee2e19a -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 73ad3844ac is already in history

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

Change-Id: I62ead3dc691b798babd9dbc4dce754809e34153c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:24:36 +00:00
Yuri Lin
4e877d0214 [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 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: Ib8a6e6417d04ce2d1abd9e639bbd6eadeadda243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:24:35 +00:00
Julia Reynolds
1cdad7c9ae Merge "Fix NPE" into sc-v2-dev am: 70cc3c99d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886854

Change-Id: Id6b047d1c50f922da3b54cfc00a5251c1df711e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 17:21:09 +00:00
Julia Reynolds
70cc3c99d3 Merge "Fix NPE" into sc-v2-dev 2022-09-22 17:08:29 +00:00
Yuri Lin
6e1c85dcca [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into sc-dev am: 0a898cde81 -s ours am: 3234273e08 -s ours am: 7453d34f25 -s ours am: 27b2bc3af6 -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 14ceb8a5e7 is already in history

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

Change-Id: I531dcde1e4c637f3d1623c936a1613a55b597f37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 16:58:00 +00:00
Yuri Lin
09637ac2fb [automerger skipped] Limit lengths of fields in Condition to a max length. am: 7059638be9 -s ours am: 854748fd6a -s ours am: 3f11a77a82 -s ours am: dd014f1424 -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 14ceb8a5e7 is already in history

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

Change-Id: Id43d8065be8e045a3eef504dd446531b5bd4665b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 16:57:36 +00:00
Yuri Lin
00d53f86bd [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into sc-qpr1-dev am: b49fc187c4 -s ours am: 33a43d3cf3 -s ours am: bd54f1530e -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 73ad3844ac is already in history

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

Change-Id: I8189c2db2300545aabca6aa31a32eb1757b5c231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 16:57:11 +00:00
Yuri Lin
7d3035d29d [automerger skipped] Limit lengths of fields in Condition to a max length. am: 14ceb8a5e7 -s ours am: 8d431561be -s ours am: 313ee2e19a -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 73ad3844ac is already in history

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

Change-Id: Ib366827b5e00e23203ea4400cc95dbee72a1e964
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 16:56:50 +00:00
Yuri Lin
055d0cc1c0 [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into sc-v2-dev am: 64a78c7a03 -s ours am: 2eec335061 -s ours am: 5e3668e22c -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 2a506d89f8 is already in history

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

Change-Id: Ib06b8114d133f2c70e1992ee8429dc4d787c9c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 16:38:38 +00:00
Yuri Lin
6587e3ffb2 [automerger skipped] Limit lengths of fields in Condition to a max length. am: 73ad3844ac -s ours am: 47be52441f -s ours am: 4c8732b3cd -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 2a506d89f8 is already in history

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

Change-Id: I2619743e5d4bd1e0a65aa7f92c8e82dc72ebfc05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 16:38:24 +00:00
Yuri Lin
2a1ec6be9e Merge "Limit lengths of fields in Condition to a max length." into tm-dev am: 4d62191383 am: f428dbeab8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19967553

Change-Id: Id95a30af5c3c3d4eff300cc06fd11712e488fb75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 16:37:54 +00:00
Treehugger Robot
54f6da707a Merge "Change 'HDMI' on music notification panel UI to 'External Device'" am: 96c760a013 am: 3d184790df am: caa3fac6b6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2221103

Change-Id: If32e468125558d315bd661a9d8a1e88ecfe81abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 16:37:02 +00:00
Yuri Lin
27b2bc3af6 [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into sc-dev am: 0a898cde81 -s ours am: 3234273e08 -s ours am: 7453d34f25 -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 14ceb8a5e7 is already in history

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

Change-Id: Ia51b68886c068b36016d9094842e8c32b2ab0ca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 16:34:14 +00:00