Commit Graph

132101 Commits

Author SHA1 Message Date
Allen Su
9bdeb34eaf Merge "[Panlingual]Log metrics for App's locale from the suggested" 2023-06-29 03:42:12 +00:00
Shawn Lin
f733b7b0ff Merge "Fix lock pattern is truncated during SUW in folded state" into udc-qpr-dev 2023-06-29 03:40:36 +00:00
SongFerng Wang
4b970a47ec Merge "Revert "Update the wording for LE Audio"" into udc-qpr-dev am: 73c811b289
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23844564

Change-Id: I3890bf56ae360167ab88442c444a49d438edc8f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 03:15:08 +00:00
Matías Hernández
8ffda6562c [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 7847d336d9 am: 253f948aad -s ours am: e385aee1cd -s ours am: 7e8f8e9306 -s ours am: 7428ed70b5 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: Ifc38bcafe821fa43407a93dd19126fc36900d1af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 03:14:34 +00:00
Matías Hernández
709eed9923 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 42afd3c182 -s ours am: 9dbcbfaa12 -s ours am: 29aa0ee34a -s ours am: d1cbbf5c6b -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I7835b0ae1efe3407c7139e0106338ad1f340d17c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 03:14:03 +00:00
Matías Hernández
2889256e89 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 7847d336d9 am: 253f948aad am: e94f056ca9 -s ours am: a0891e388f -s ours am: e1ebb40236 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I64dedaa2b959845c614cb2da2dea97eb82ae7031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 03:09:33 +00:00
Matías Hernández
913c665563 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 7847d336d9 am: 253f948aad -s ours am: e385aee1cd -s ours am: 534649a24d -s ours am: b6d8bfb999 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I9f434a8ccf69db6876f66779f363ad3fe6024106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 03:09:20 +00:00
Matías Hernández
4b4d226e00 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 42afd3c182 -s ours am: 9dbcbfaa12 -s ours am: ddbd590054 -s ours am: 0a176d50ef -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I7e77a39030e68062a7a3aef6becfef4597ed61f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 03:09:02 +00:00
Matías Hernández
7519bb3c41 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 7847d336d9 am: 253f948aad -s ours am: e385aee1cd -s ours am: 7e8f8e9306 -s ours am: a62896fe2c -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I975b099eab64b97bdf736abdd306dc8790ae9e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 03:08:19 +00:00
Matías Hernández
d5f4fb88f2 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 42afd3c182 -s ours am: 9dbcbfaa12 -s ours am: 29aa0ee34a -s ours am: 4bd74857ef -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I6487fade87ac9a20e7aca2af17a4985ae6be66c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 03:07:57 +00:00
Chaohui Wang
16ad888fff Merge "Fix cursor is empty in ApnEditor" 2023-06-29 03:01:34 +00:00
Chun-Ku Lin
20976c3a53 use L10n-friendly runtime number formatting based on locale
Arabic use Western or Eastern numbers depends on the regions.

Bug: 276479321
Test: atest AccessibilityButtonFooterPreferenceControllerTest
Test: manual
Change-Id: I855f4fd891893b094163b0d479bdf3e5155dffc1
2023-06-29 02:48:32 +00:00
SongFerng Wang
73c811b289 Merge "Revert "Update the wording for LE Audio"" into udc-qpr-dev 2023-06-29 02:37:44 +00:00
Matías Hernández
d30d32b553 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 7847d336d9 am: 253f948aad -s ours am: e385aee1cd -s ours am: ebf5c0c4d5 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I6f229f1534eb129b3772244d16ccb20e7dbe1ae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 02:27:45 +00:00
Matías Hernández
e1ebb40236 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 7847d336d9 am: 253f948aad am: e94f056ca9 -s ours am: a0891e388f -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I618bbb606303efd996e3f49c6e93ef677be4e701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 02:27:36 +00:00
Matías Hernández
57328ea862 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 42afd3c182 -s ours am: 9dbcbfaa12 -s ours am: c77688932e -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: Ife9a214fc71ff9d11df880ff4d7b1bcdd8b75578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 02:27:25 +00:00
Matías Hernández
b6d8bfb999 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 7847d336d9 am: 253f948aad -s ours am: e385aee1cd -s ours am: 534649a24d -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I3a26b3f8f4a3374c71cc8edf4d1b1802268a1d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 02:27:22 +00:00
Matías Hernández
7428ed70b5 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 7847d336d9 am: 253f948aad -s ours am: e385aee1cd -s ours am: 7e8f8e9306 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: Ifc24f4f7e817ae61e725722e46b10c1eb2ba04ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 02:26:52 +00:00
Matías Hernández
0a176d50ef [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 42afd3c182 -s ours am: 9dbcbfaa12 -s ours am: ddbd590054 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: Ia10582e59b33839f3dab65c927fcaf827aa8feee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 02:26:50 +00:00
Matías Hernández
d1cbbf5c6b [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 42afd3c182 -s ours am: 9dbcbfaa12 -s ours am: 29aa0ee34a -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I8e50639200513e6f3753f088b347751b08933766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 02:26:40 +00:00
Matías Hernández
a0891e388f [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 7847d336d9 am: 253f948aad am: e94f056ca9 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I945b9ce686bd13fe1668ce5ca695ef545ba58770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 02:26:15 +00:00
Matías Hernández
a62896fe2c [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 7847d336d9 am: 253f948aad -s ours am: e385aee1cd -s ours am: 7e8f8e9306 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I86d1e29706d7c51b5d0b5641f6a55bb89f55b1b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 02:25:14 +00:00
Matías Hernández
ee9a9b8ecd [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 7847d336d9 am: 253f948aad -s ours am: e385aee1cd -s ours am: 8109b4b3a3 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: If8294ced6fc3360ade5ce96844bfd17594579ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 02:25:03 +00:00
Matías Hernández
4bd74857ef [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 42afd3c182 -s ours am: 9dbcbfaa12 -s ours am: 29aa0ee34a -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: Ifc658393bd4f0fb5bffffc7d6bdb78d55761af94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 02:24:57 +00:00
Matías Hernández
b7ddcfd971 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 42afd3c182 -s ours am: 9dbcbfaa12 -s ours am: cbaad821d6 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I0787ab54d0e4701d22b8a766380e96e631cbb7aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 02:24:30 +00:00
Matías Hernández
8109b4b3a3 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 7847d336d9 am: 253f948aad -s ours am: e385aee1cd -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I7ac7386d74b026e6bc2716172fbf551df7b9f98f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 02:03:50 +00:00
Matías Hernández
534649a24d [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 7847d336d9 am: 253f948aad -s ours am: e385aee1cd -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: Ib9974bab70303328e9f590bfe31f81f361cd91c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 01:43:06 +00:00
Matías Hernández
ddbd590054 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 42afd3c182 -s ours am: 9dbcbfaa12 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: Ib95833caa889adc369770b1fe1a4c8407db10a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 01:42:51 +00:00
Matías Hernández
ebf5c0c4d5 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 7847d336d9 am: 253f948aad -s ours am: e385aee1cd -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I5da632c6ad796aaa2c66a1ff6f43ea8422123af8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 01:42:41 +00:00
Matías Hernández
e94f056ca9 Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 7847d336d9 am: 253f948aad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: Id04b928ff2c2bcf702bd836c72d53b8acfc1b75d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 01:42:39 +00:00
Matías Hernández
7e8f8e9306 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 7847d336d9 am: 253f948aad -s ours am: e385aee1cd -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I0aa292fc9a772c1e6e46a46e02b65f666e643136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 01:42:27 +00:00
Matías Hernández
c77688932e [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 42afd3c182 -s ours am: 9dbcbfaa12 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I9e948c70d90a7c3b91035d908752eb3ee9faf052
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 01:42:17 +00:00
Matías Hernández
29aa0ee34a [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 42afd3c182 -s ours am: 9dbcbfaa12 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: Iafe3f0f2f3f0cfa1b8a553953565032dec0c2e04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 01:42:12 +00:00
Matías Hernández
cbaad821d6 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 42afd3c182 -s ours am: 9dbcbfaa12 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I7b766fb853e2cb4a4648f86e8c66b89303922f32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 01:41:53 +00:00
Matías Hernández
e385aee1cd [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 7847d336d9 am: 253f948aad -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: Iddc7166a9254597a82d5a19f144429e712faec14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 01:41:21 +00:00
Matías Hernández
253f948aad Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 7847d336d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I84d8aa08502725d1e24d80946884eb8cab9287ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 00:59:57 +00:00
Matías Hernández
9dbcbfaa12 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a am: 42afd3c182 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: Idd23bcdf229afda6451ad92e7c13cb7410d5a869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 00:57:12 +00:00
Matías Hernández
7847d336d9 Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: Ib235490bd7dc40a1d5146cdb8ea20abed4406996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 00:16:39 +00:00
Matías Hernández
42afd3c182 Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493

Change-Id: I3228d4d29e905c0481fe1637580aaf2caaab9cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 00:15:34 +00:00
Grace Cheng
180ea8156b [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 -s ours am: d7e397e97c -s ours am: ab1b393412 -s ours am: ccc1c6c749 -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I1ca1441771da04cce4d4583b8095472fac427ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:58:14 +00:00
Grace Cheng
9c4b3af7cc [automerger skipped] Fix NPE in updateAddPreference am: f58714496a -s ours am: 0dcfdacc25 -s ours am: d320388f91 -s ours am: 6066b06cc1 -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I6691cfcaecb22ba91aadd7fa3af346826333e8ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:58:11 +00:00
Grace Cheng
739ee40495 [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 -s ours am: d7e397e97c -s ours am: 71671c1eca -s ours am: 3132c57c05 -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I07cd280904a45b58af10376e8a4e9687d6c35c24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:57:04 +00:00
Grace Cheng
9e9290f91f [automerger skipped] Fix NPE in updateAddPreference am: f58714496a -s ours am: 0dcfdacc25 -s ours am: 2ee3088167 -s ours am: 40e82e3a47 -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: If64d4455a889ee1ef566f5c23b5691d440b26369
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:57:01 +00:00
Grace Cheng
3095174a6f [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 am: f73f073643 -s ours am: 60f4e180a2 -s ours am: 39f518b258 -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I770c48cda1a84c0ce2775a351befa8fa9b74c988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:56:11 +00:00
Matías Hernández
2e7431d6cd Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: 0d21526217 am: 63a50999f5 am: f03e08c644
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I4eca96495323d0c713836823acd5d80ce6256c34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:54:51 +00:00
Matías Hernández
728291e33e Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9 am: 9feb898da7 am: bb3122ca29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I18386b9eeb9abbd97df605b5057de591872f8213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:53:28 +00:00
Matías Hernández
bc7844a313 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9 am: e20f52a05a am: 281c4b631c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: Ib6b25e65790ec023e63b5b2400762de51ee76065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:50:08 +00:00
Grace Cheng
ccc1c6c749 [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 -s ours am: d7e397e97c -s ours am: ab1b393412 -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I449ef5d9d54e452aeb251cd3b35d7053db0c9be2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:47:59 +00:00
Grace Cheng
6066b06cc1 [automerger skipped] Fix NPE in updateAddPreference am: f58714496a -s ours am: 0dcfdacc25 -s ours am: d320388f91 -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I5cd9867bbf15aaafa226abb874766c258eb2ed55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:47:57 +00:00
Grace Cheng
3132c57c05 [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 -s ours am: d7e397e97c -s ours am: 71671c1eca -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I1917b214ecfec15eb9630bf6780a3c2bf6e33c9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:46:37 +00:00