Commit Graph

132702 Commits

Author SHA1 Message Date
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
Grace Cheng
40e82e3a47 [automerger skipped] Fix NPE in updateAddPreference am: f58714496a -s ours am: 0dcfdacc25 -s ours am: 2ee3088167 -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: Ie148ac91f62cf55ff53e1c3df8b6b334997e2c60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:46:35 +00:00
Grace Cheng
39f518b258 [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 am: f73f073643 -s ours am: 60f4e180a2 -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: I730dab9c7076a3abbae467fbb30b3d9cd0298f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:45:11 +00:00
Matías Hernández
f03e08c644 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: 0d21526217 am: 63a50999f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

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

Change-Id: I029027019505a86fbf88ad4a127d6f0ffa11ce79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:41:36 +00:00
Grace Cheng
ab1b393412 [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 -s ours am: d7e397e97c -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: I666bbd8a1c16dabbab2c695c952931780f18e024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:03:42 +00:00
Grace Cheng
d320388f91 [automerger skipped] Fix NPE in updateAddPreference am: f58714496a -s ours am: 0dcfdacc25 -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: I2be7f013fed0d18eeec29f0461e7891eabc287ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:03:40 +00:00
Grace Cheng
dc3404939c [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 am: add8f5cda2 -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 f58714496a is already in history

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

Change-Id: I2cd78c810b1cbe4f3f8f43370e6d64b460446cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 19:00:07 +00:00
Grace Cheng
71671c1eca [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 -s ours am: d7e397e97c -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: I7d179a1b1ac8465fea36a14ca04e57aed6db1cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:59:50 +00:00
Grace Cheng
2ee3088167 [automerger skipped] Fix NPE in updateAddPreference am: f58714496a -s ours am: 0dcfdacc25 -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: I40e8eaf893dac682f8120213c32c28025fbbf29f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:59:47 +00:00
Grace Cheng
694569f60c [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 am: 279e4c77f0 -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: Icf5eabcdc24d83a3728768d47fb5b29c3da2ce9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:59:26 +00:00
Matías Hernández
281c4b631c Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9 am: e20f52a05a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

Change-Id: I2bcd0934af1e0e4d6679e04293f04bbebcadab4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:44:07 +00:00
Grace Cheng
60f4e180a2 [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 am: f73f073643 -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: I6581685284601d4ee82c4585a922092c17e12856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:41:14 +00:00
Grace Cheng
279e4c77f0 Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I4d1d06bcff647eec3e10fa99636f301563e05ab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:40:35 +00:00
Grace Cheng
d7e397e97c [automerger skipped] Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212 -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: I76d59e589e5f8882f2872da723dc20975ea60a1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:40:15 +00:00
Grace Cheng
0dcfdacc25 [automerger skipped] Fix NPE in updateAddPreference am: f58714496a -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: Ie5120e61d7df71adf77970088a3be7334ed6a4f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:40:12 +00:00
Matías Hernández
63a50999f5 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: 0d21526217
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

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

Change-Id: I8fc3a7b239ce0545b34eafc860df72a42cfd2e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:39:16 +00:00
Grace Cheng
add8f5cda2 Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: Icaadc6f5a6c0711bf4122706363c82753a93869c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:39:15 +00:00
Grace Cheng
f73f073643 Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755

Change-Id: I691796e372f65ffec44954a850d462f796c19f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:36:58 +00:00
Automerger Merge Worker
21eb1a3802 Merge "Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: 57739acf63" 2023-06-28 18:36:21 +00:00
Matías Hernández
412fc3e2c4 Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: 143d105dc9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247

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

Change-Id: I0f6901ca11f07090c15146dac2b0b39c67db8eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 18:35:52 +00:00