Treehugger Robot
34ea30a0d3
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev am: 6cf9c58fa5
-s ours am: 78d86e927c
-s ours am: a81ed851af
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846
Change-Id: I0a8dd94ccf91e0dc2b2465880e8a9742790cb979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 22:37:25 +00:00
Taran Singh
045a9bfd32
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0564ec25bb
-s ours am: c07555d438
-s ours am: 56c4d2a5a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846
Change-Id: Ie86aaae1a2c7112728f47b7788e67521b690d085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 22:37:22 +00:00
Treehugger Robot
2df32f537f
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev am: 9fa4b1e0a6
am: 3c039ca648
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222
Change-Id: I4e64723c0a72e58634b968d60036af6fdc67980d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 22:37:06 +00:00
Taran Singh
a9488a71bc
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: cb2b753094
am: c362ee7dc2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222
Change-Id: I5e211d476ee3342887d0a9fe750508024fc59c24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 22:37:03 +00:00
Treehugger Robot
a81ed851af
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev am: 6cf9c58fa5
-s ours am: 78d86e927c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846
Change-Id: I0e7018a6fbb3c46cb311e4930f556355c8572593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:49:58 +00:00
Taran Singh
56c4d2a5a5
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0564ec25bb
-s ours am: c07555d438
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846
Change-Id: I6e1609405cf56340e1bd6e27ebc5f52727124c32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:49:56 +00:00
Treehugger Robot
3c039ca648
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev am: 9fa4b1e0a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222
Change-Id: I3600c6f5384fc127e090f0f21a4ad97163b91438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:49:40 +00:00
Taran Singh
c362ee7dc2
DO NOT MERGE: Prevent non-system IME from becoming device admin am: cb2b753094
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222
Change-Id: Iaab0f378348324755deffaf9e585aa25a6b46e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:49:38 +00:00
Treehugger Robot
78d86e927c
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev am: 6cf9c58fa5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846
Change-Id: If0574725dc2bec4837c1554351fffc9419a6723c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:49:29 +00:00
Taran Singh
c07555d438
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0564ec25bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846
Change-Id: I1ce4bda4ba2ba024a6d1228df1ee0cf105c51854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:49:26 +00:00
Treehugger Robot
9fa4b1e0a6
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev
2023-07-06 21:18:12 +00:00
Treehugger Robot
376bf07767
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev
2023-07-06 21:17:45 +00:00
Treehugger Robot
6cf9c58fa5
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev
2023-07-06 21:15:44 +00:00
Treehugger Robot
2c62993aca
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250
Change-Id: I3fd1ff543e6633ff4141e771bdc24aac9a6de72f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 20:46:31 +00:00
Taran Singh
a8bd8948d1
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250
Change-Id: I508c24a6e322088a28f3777ec05756818690f73b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 20:46:29 +00:00
Treehugger Robot
e5f9ab14ce
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev
2023-07-06 19:53:12 +00:00
Matías Hernández
c4aa31013d
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours am: 97ecfd35d6
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I62449382a3b6365bfe7fba8b1f148be486f9235f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 18:45:31 +00:00
Matías Hernández
97ecfd35d6
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ib2b171219769531b706b62ccb6759adeacc1129d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 17:57:31 +00:00
Matías Hernández
9eb2824be8
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours
...
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ib404f16baae58c5244ba61fe82974a1d93fa681a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 17:11:24 +00:00
Matías Hernández
42bd4d88c2
Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Iaf37229e9570c29792e801446e8db162ebb3dbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 16:25:28 +00:00
Matías Hernández
95fbc856ad
Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Ic711190cfc7ce3437e324a96d97c628b52d48480
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 10:13:23 +00:00
Matías Hernández
5985612633
Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I51744909a3ef6fcb1406dcc24d857d9b9eb88057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 09:29:06 +00:00
Matías Hernández
f0367c98d0
Settings: don't try to allow NLSes with too-long component names
...
* NotificationAccessConfirmationActivity (triggered through CompanionDeviceManager) -> Don't show the dialog, bail out early similarly to other invalid inputs.
* NotificationAccessSettings (from Special App Access) -> No changes, but use the canonical constant now.
* ApprovalPreferenceController (used in NotificationAccessDetails) -> Disable the toggle, unless the NLS was previously approved (in which case it can still be removed).
Fixes: 260570119
Fixes: 286043036
Test: atest + manually
Change-Id: Ifc048311746c027e3683cdcf65f1079d04cf7c56
Merged-In: Ifc048311746c027e3683cdcf65f1079d04cf7c56
2023-06-19 09:58:28 +00:00
Matías Hernández
f1af8c5292
Settings: don't try to allow NLSes with too-long component names
...
* NotificationAccessConfirmationActivity (triggered through CompanionDeviceManager) -> Don't show the dialog, bail out early similarly to other invalid inputs.
* NotificationAccessSettings (from Special App Access) -> No changes, but use the canonical constant now.
* NotificationAccessDetails -> Disable the toggle, unless the NLS was previously approved (in which case it can still be removed).
Fixes: 260570119
Fixes: 286043036
Test: atest + manually
Change-Id: Ifc048311746c027e3683cdcf65f1079d04cf7c56
Merged-In: Ifc048311746c027e3683cdcf65f1079d04cf7c56
2023-06-19 11:49:11 +02:00
Matías Hernández
d185f3aebf
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0
am: d7608c84b4
-s ours am: 78a4048eac
-s ours am: b971690a4e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I9944714c4b97d46b20f78ecd02b875aa21672ab0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 15:11:01 +00:00
Matías Hernández
b971690a4e
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0
am: d7608c84b4
-s ours am: 78a4048eac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I26937792ea087b7b2516e71525fa12602d312696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 14:26:51 +00:00
Matías Hernández
a49e14f8ff
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I840d7836ae899bcd40eafc772b96c9460c3f8a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 13:42:07 +00:00
Matías Hernández
78a4048eac
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0
am: d7608c84b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: Ifee74173a3e0f410d4d76f06149b496a9ae62241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 13:40:43 +00:00
Matías Hernández
50df60c93c
Don't hide approved NLSes in Settings am: ff255c6eda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I42099e38ef7b479b9339b545fe8d12d3bbe95112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 12:57:15 +00:00
Matías Hernández
d7608c84b4
DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I11ee7cc3bfd291f32e602eff65ce93ba57bcc407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 12:52:41 +00:00
Taran Singh
76b536abc8
DO NOT MERGE: Prevent non-system IME from becoming device admin
...
Currently selected IME can inject KeyEvent on DeviceAdminAdd screen to
activate itself as device admin and cause various DoS attacks.
This CL ensures KeyEvent on "Activate" button can only come from system
apps.
Bug: 280793427
Test: atest DeviceAdminActivationTest
Change-Id: I6470d1684d707f4b1e86f8b456be0b4e0af5f188
(cherry picked from commit 70a501d02e
)
2023-06-07 21:43:59 +00:00
Taran Singh
27a97f4583
DO NOT MERGE: Prevent non-system IME from becoming device admin
...
Currently selected IME can inject KeyEvent on DeviceAdminAdd screen to
activate itself as device admin and cause various DoS attacks.
This CL ensures KeyEvent on "Activate" button can only come from system
apps.
Bug: 280793427
Test: atest DeviceAdminActivationTest
Change-Id: I6470d1684d707f4b1e86f8b456be0b4e0af5f188
(cherry picked from commit 70a501d02e
)
2023-06-07 21:12:08 +00:00
Taran Singh
0564ec25bb
DO NOT MERGE: Prevent non-system IME from becoming device admin
...
Currently selected IME can inject KeyEvent on DeviceAdminAdd screen to
activate itself as device admin and cause various DoS attacks.
This CL ensures KeyEvent on "Activate" button can only come from system
apps.
Bug: 280793427
Test: atest DeviceAdminActivationTest
Change-Id: I6470d1684d707f4b1e86f8b456be0b4e0af5f188
(cherry picked from commit 70a501d02e
)
2023-06-07 18:29:05 +00:00
Matías Hernández
ff255c6eda
Don't hide approved NLSes in Settings
...
Note that an NLS that shouldn't be approvable (because its name is too long) but was already approved (either before the max length check was introduced, or through other means) will disappear from the list if the user revokes its access. This might be somewhat confusing, but since this is a very-edge case already it's fine.
Bug: 282932362
Test: manual
Change-Id: I4c9faea68e6d16b1a4ec7f472b5433cac1704c06
2023-06-06 19:07:58 +02:00
Matías Hernández
173cc267e0
DO NOT MERGE Don't hide approved NLSes in Settings
...
Note that an NLS that shouldn't be approvable (because its name is too long) but was already approved (either before the max length check was introduced, or through other means) will disappear from the list if the user revokes its access. This might be somewhat confusing, but since this is a very-edge case already it's fine.
Bug: 282932362
Test: manual
Change-Id: Iccfe7b53d643d6c9f9516f91d3cee3309b11551e
2023-06-05 17:16:48 +00:00
Taran Singh
cb2b753094
DO NOT MERGE: Prevent non-system IME from becoming device admin
...
Currently selected IME can inject KeyEvent on DeviceAdminAdd screen to
activate itself as device admin and cause various DoS attacks.
This CL ensures KeyEvent on "Activate" button can only come from system
apps.
Bug: 280793427
Test: atest DeviceAdminActivationTest
Change-Id: I6470d1684d707f4b1e86f8b456be0b4e0af5f188
(cherry picked from commit 70a501d02e
)
2023-06-02 22:37:11 +00:00
Lin Yuan
f86d507407
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
am: 062a9ca549
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Change-Id: I7884ced3a0a1d29508127fbc263197c20f6ff0d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 23:23:36 +00:00
Lin Yuan
062a9ca549
[automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203
Bug: 277333746
Bug: 277333781
Change-Id: I91aa143223d7d37751120aa9246bce4dc31a54a6
2023-04-25 19:24:13 +00:00
Lin Yuan
7591fff234
Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency.
...
When DISALLOW_CONFIG_LOCATION is set, make location service's
MainSwitchPreference pages for wifi scanning and bluetooth scanning
unavailable too, so that intent direct access is disabled.
screenshot: http://shortn/_kkK3BMTSh1
Bug: 277333746
Bug: 277333781
Test: atest SettingsRoboTests, on device
Change-Id: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39
2023-04-25 19:23:53 +00:00
Julia Reynolds
684952a8b0
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours am: 85c25d29d7
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ic239b938c957b82b8eb072ba55b34ab9388a24af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:25:15 +00:00
Julia Reynolds
85c25d29d7
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I8124bdb6668bc43f275489abb311994ea69645db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 16:58:46 +00:00
Julia Reynolds
cfacc2acb8
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ie11a802db36591d58289cd82956c5205f0893244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 16:28:40 +00:00
Julia Reynolds
8befc27425
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I8d1fa61e9c43c711725505554b464697f1f1ad4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 15:56:56 +00:00
Julia Reynolds
82fcfa8da0
[automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618
-s ours am: ceb2d0400a
-s ours am: 7c9190d25a
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647
Change-Id: I78da1d627b1db61015124fbd3df59cd80376bbf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 21:16:39 +00:00
Julia Reynolds
7c9190d25a
[automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618
-s ours am: ceb2d0400a
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647
Change-Id: Icb423063d82a05cfb734fd889f2799474f453c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 20:43:18 +00:00
Julia Reynolds
ceb2d0400a
[automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647
Change-Id: I6ab06a30496dffbfc038300866d0b3ca3c1d42a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 20:25:32 +00:00
Julia Reynolds
acb5e90d5d
[automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a
am: cbb6811219
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290646
Change-Id: I844c70ca3340a3800ca2b88b55094fdb9f111635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 19:08:05 +00:00
Julia Reynolds
cbb6811219
[automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a
...
Blank merge reason: Change-Id I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290646
Bug: 260570119
Change-Id: I5b2a0e7a53697962ea7f3b70891f70d687936332
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-28 16:56:20 +00:00
Julia Reynolds
52a102cc2a
Don't show NLSes with excessively long component names
...
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-28 16:56:07 +00:00
Julia Reynolds
2e701b29dc
Don't show NLSes with excessively long component names am: 1f3969f615
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645
Change-Id: I6316f0181d44d0d0a83f09d36d27cc4839e4ddfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 15:27:55 +00:00