Commit Graph

781002 Commits

Author SHA1 Message Date
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
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
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
Yuri Lin
dd014f1424 [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 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: If500effddf67b8ed8556950c0e0bf0122edf84bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:33:43 +00:00
Yuri Lin
bd54f1530e [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 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: I92eb1b445a021d68d24de346469b6f72afe9c5a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:33:26 +00:00
Yuri Lin
5e3668e22c [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 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: I5e07711db142a67282c666265961e324447c6ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:33:16 +00:00
Yuri Lin
4c8732b3cd [automerger skipped] Limit lengths of fields in Condition to a max length. am: 73ad3844ac -s ours am: 47be52441f -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: I162da02bed3dfe6544c048f7e938f3c05f31020e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:32:59 +00:00
Yuri Lin
313ee2e19a [automerger skipped] Limit lengths of fields in Condition to a max length. am: 14ceb8a5e7 -s ours am: 8d431561be -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: I2c18ba4a306156afb3629d1ce5b0a7c4130d3776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:32:58 +00:00
Yuri Lin
7453d34f25 [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 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: Idcc9664a55539850ed3acf024ce2c6faffa14393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:13:26 +00:00
Yuri Lin
3f11a77a82 [automerger skipped] Limit lengths of fields in Condition to a max length. am: 7059638be9 -s ours am: 854748fd6a -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: I90a310f9670a2e0e54afdeb11f619ce88c504150
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:13:16 +00:00
Yuri Lin
498398ffe2 [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 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: Ibac30506d63af38035ee961b8e212d5a73bc8c4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:12:50 +00:00
Yuri Lin
aeb38a1676 [automerger skipped] Limit lengths of fields in Condition to a max length. am: 73ad3844ac -s ours am: 47be52441f -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: Ia57c34a54123b2b5e10c1d6bbc0dee39bce7b621
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:12:45 +00:00
Yuri Lin
58b4652bbf Merge "Limit lengths of fields in Condition to a max length." into tm-dev am: 4d62191383
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19967553

Change-Id: I2c865bf2e8c64e84beef8d9265a7a1b936f15855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:12:34 +00:00
Yuri Lin
33a43d3cf3 [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into sc-qpr1-dev am: b49fc187c4 -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: I558c6a1780af658d6fbf296a7cc54e4ca547e367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:12:13 +00:00
Yuri Lin
8d431561be [automerger skipped] Limit lengths of fields in Condition to a max length. am: 14ceb8a5e7 -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: Ia25229bfc5b236edaf6894518f5771dae55dcbb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:12:09 +00:00
Yuri Lin
3234273e08 [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into sc-dev am: 0a898cde81 -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: I76d24e57d170ffda6fe84259933e4f2b3c4970aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:09:27 +00:00
Yuri Lin
2eec335061 [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into sc-v2-dev am: 64a78c7a03 -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: I398e169a067e621b3cf937b1a9b51fa25e3aaf68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:09:17 +00:00
Yuri Lin
854748fd6a [automerger skipped] Limit lengths of fields in Condition to a max length. am: 7059638be9 -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: Idd273e330c93e0ac7036bd7f06923248650145a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:09:16 +00:00
Yuri Lin
f428dbeab8 Merge "Limit lengths of fields in Condition to a max length." into tm-dev am: 4d62191383
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19967553

Change-Id: Ie173fca9034338db7d2fe8b61bfc66bf977f7f05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:09:13 +00:00
Yuri Lin
47be52441f [automerger skipped] Limit lengths of fields in Condition to a max length. am: 73ad3844ac -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: I500850bef3fb2538f101622e4fc574d25280fd16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:08:50 +00:00
Treehugger Robot
caa3fac6b6 Merge "Change 'HDMI' on music notification panel UI to 'External Device'" am: 96c760a013 am: 3d184790df
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2221103

Change-Id: If0fea085f33dde8c571396848a152bb71b6a3af3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 15:49:31 +00:00
Yuri Lin
0a898cde81 Merge "Limit lengths of fields in Condition to a max length." into sc-dev 2022-09-22 15:20:28 +00:00
Yuri Lin
b49fc187c4 Merge "Limit lengths of fields in Condition to a max length." into sc-qpr1-dev 2022-09-22 15:19:34 +00:00
Yuri Lin
64a78c7a03 Merge "Limit lengths of fields in Condition to a max length." into sc-v2-dev 2022-09-22 15:19:21 +00:00
Yuri Lin
4d62191383 Merge "Limit lengths of fields in Condition to a max length." into tm-dev 2022-09-22 15:19:09 +00:00
Treehugger Robot
3d184790df Merge "Change 'HDMI' on music notification panel UI to 'External Device'" am: 96c760a013
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2221103

Change-Id: I396f7e408b91d5d2f9d7d2f8d399dc8c0f647efc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 14:55:28 +00:00
Sorin Basca
dd8e8b2bfd Merge "Fix errorprone 2.15.0 errors" am: f9ae30fa6f am: 211af41853 am: e224114968
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2220922

Change-Id: Ia370f421a1b9336cd0a56007630fa5938206eb38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 14:32:50 +00:00
Treehugger Robot
96c760a013 Merge "Change 'HDMI' on music notification panel UI to 'External Device'" 2022-09-22 14:12:01 +00:00
Sorin Basca
e224114968 Merge "Fix errorprone 2.15.0 errors" am: f9ae30fa6f am: 211af41853
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2220922

Change-Id: Ic043511a95b7e5baf3779a9ba3eab2ace7cead02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 13:45:00 +00:00
Jeff Chang
e302eeec12 Merge "Remove duplicated white space in ContextImpl when throw AndroidRuntimeException" am: 67d1bacd75 am: 5998e8c203 am: 96b69de42f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2219559

Change-Id: Ia6f1ae30a094fe827736e5eeb8614e650ce927b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 13:21:11 +00:00
Sorin Basca
211af41853 Merge "Fix errorprone 2.15.0 errors" am: f9ae30fa6f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2220922

Change-Id: Ia4df0f1d0c4b41fc54c2a5f208150e7098de260b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 12:54:35 +00:00
Jeff Chang
96b69de42f Merge "Remove duplicated white space in ContextImpl when throw AndroidRuntimeException" am: 67d1bacd75 am: 5998e8c203
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2219559

Change-Id: Id12ed0e37db2e537f1990092648fce39d7c057da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 12:35:40 +00:00
Sorin Basca
f9ae30fa6f Merge "Fix errorprone 2.15.0 errors" 2022-09-22 12:07:04 +00:00
Jeff Chang
5998e8c203 Merge "Remove duplicated white space in ContextImpl when throw AndroidRuntimeException" am: 67d1bacd75
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2219559

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