Taran Singh
bf1fb18449
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583
-s ours am: a8bd8948d1
-s ours am: 02ef9c46ec
-s ours am: ebe5235c23
-s ours am: b24681d7d7
-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: I5a1212091a6ce55632b3c91b5f714f93ef46905b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 00:16:02 +00:00
Treehugger Robot
0c60765de0
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10
am: 25522ce664
am: 05f50bb0f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: Id21bfe1bfef80f943acec1f491007610b98a4c38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 00:15:27 +00:00
Taran Singh
5c0e6518ab
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d
am: eda2ffbeca
-s ours am: 4a95efc3bc
-s ours
...
am skip reason: skipped by user tarandeep
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: I349066663178bd6ea5fbe907d6cb93d8eb430347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-07 00:15:23 +00:00
Taran Singh
b24681d7d7
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583
-s ours am: a8bd8948d1
-s ours am: 02ef9c46ec
-s ours am: ebe5235c23
-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: I4d72cf051b47fcc9582d894af7a1570f98b3252e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 23:22:05 +00:00
Treehugger Robot
05f50bb0f6
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10
am: 25522ce664
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: I87a4c05ad8b09c8d18ac1822c11d54b94d202ff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 23:21:43 +00:00
Taran Singh
4a95efc3bc
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d
am: eda2ffbeca
-s ours
...
am skip reason: skipped by user tarandeep
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: I34f7f296eda9c53206da6c482e6917db6ee44d0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 23:21:41 +00:00
Taran Singh
ebe5235c23
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583
-s ours am: a8bd8948d1
-s ours am: 02ef9c46ec
-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: Ie5953b8f10b835ef6593f406e00c9313822a0b73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 22:15:06 +00:00
Taran Singh
02ef9c46ec
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583
-s ours am: a8bd8948d1
-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: Ifb4be3245cc2129523eff706cb2090902c6a7b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:25:05 +00:00
Treehugger Robot
25522ce664
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: I6fc9be3afa74d954bf2949ba9a4f555905304edc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:08:55 +00:00
Taran Singh
eda2ffbeca
DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: Ifa32ff76702ededcc32e36c975c35db920e343ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 21:08:52 +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
60da71ecfb
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: I68ecb31f7dc41ff09208bcce533264db9a853ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 20:43:51 +00:00
Taran Singh
73becab672
DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218
Change-Id: Icc9e0866bcf0a1f41911c697936d5cb31c4f3b78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 20:43:47 +00:00
Treehugger Robot
8e3d6f0a10
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev
2023-07-06 20:35:41 +00:00
Treehugger Robot
fbe97f1ee4
Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev
2023-07-06 20:04:21 +00:00
Matías Hernández
ebb5bf9f1a
[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: c4aa31013d
-s ours am: d828f6a917
-s ours am: 0d3e0dc397
-s ours am: 7088dd37ec
-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: Ic1575200df5b1fd0d88427d8383cac1da30acc5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 22:36:05 +00:00
Matías Hernández
7088dd37ec
[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: c4aa31013d
-s ours am: d828f6a917
-s ours am: 0d3e0dc397
-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: I3aaeacc0f707d6a3c72fedf74aba8cb76a1ad6df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 21:55:19 +00:00
Matías Hernández
0d3e0dc397
[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: c4aa31013d
-s ours am: d828f6a917
-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: I240139ad6fd2072b7c2990a20423dfeed10b9763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 20:22:12 +00:00
Matías Hernández
d828f6a917
[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: c4aa31013d
-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: I8351da597688d18c52b97ed1f22e909cfc168a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 19:49:05 +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
956ff6faa8
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours am: 8c1394e58e
-s ours am: 476dd8fba2
-s ours am: c1d4561832
-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/+/23712724
Change-Id: I5a135fa2ed00571cbfe817174c2867be4ec67a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 13:04:37 +00:00
Matías Hernández
c1d4561832
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours am: 8c1394e58e
-s ours am: 476dd8fba2
-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/+/23712724
Change-Id: I89b51fbd2791e323be34fc92d128095a093c9e3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 12:24:58 +00:00
Matías Hernández
476dd8fba2
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-s ours am: 8c1394e58e
-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/+/23712724
Change-Id: Id6a9b6a60b2455596795c11b3d286cc84a71d42b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 11:41:09 +00:00
Matías Hernández
8c1394e58e
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0
am: 5985612633
am: 95fbc856ad
-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/+/23712724
Change-Id: I729b32b7ace1c1679c14ed555fd7d87e8d86f72d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 10:52:31 +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
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
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
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
Xin Li
164acf327a
[automerger skipped] Merge "Merge Android 13 QPR3" am: 65c31baf7f
-s ours am: c61819e807
-s ours
...
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2635192
Change-Id: Id8b3ff644094f429231676ca4b4aa34a23ac4062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-26 23:12:11 +00:00
Xin Li
e7ba843385
[automerger skipped] Merge Android 13 QPR3 am: 3e6b213e75
-s ours am: ba9cb49565
-s ours
...
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2635192
Change-Id: I539ae150f02bd6b5d03249c043cefc8323a31dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-26 23:10:28 +00:00
Xin Li
c61819e807
[automerger skipped] Merge "Merge Android 13 QPR3" am: 65c31baf7f
-s ours
...
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2635192
Change-Id: I2d14107a37340b8b34ae71c67f7f705a272324b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-26 22:59:27 +00:00
Xin Li
ba9cb49565
[automerger skipped] Merge Android 13 QPR3 am: 3e6b213e75
-s ours
...
am skip reason: Merged-In I11e6110ba0b640be8b373d9afd45f806c005b05f with SHA-1 45918b72bf
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2635192
Change-Id: I86a2ecc0803fdf920a6a10367d7eb0f9d06b6807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-26 22:57:43 +00:00
Xin Li
65c31baf7f
Merge "Merge Android 13 QPR3"
2023-06-26 22:29:52 +00:00
Bill Yi
392e63d166
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23789283
Change-Id: I853a031bccb32b7086892e93b062fc1a8624c894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-24 00:12:13 +00:00
Bill Yi
e2abc0ab7a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia036b42598639dac49342562f238cb378b3f6091
2023-06-22 22:06:04 -07:00
Xin Li
3e6b213e75
Merge Android 13 QPR3
...
Bug: 275386652
Merged-In: I11e6110ba0b640be8b373d9afd45f806c005b05f
Change-Id: I885fdb1d60c595314c9f3ed229dc030a75edab00
2023-06-21 15:16:07 -07:00
Treehugger Robot
e1858cab06
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97
am: 45918b72bf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212
Change-Id: I41a6347afc1fe6a038ac75bf6a76855b42268f3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 13:50:31 +00:00
Treehugger Robot
45918b72bf
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212
Change-Id: I11e6110ba0b640be8b373d9afd45f806c005b05f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 13:13:42 +00:00
Treehugger Robot
aa3dc53d97
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE"
2023-06-20 12:13:34 +00:00
Dmitrii Merkurev
d7d4ec224f
Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE
...
Currently factory reset action is ignored if
PERSISTENT_DATA_BLOCK_SERVICE isn't presented on device.
Make sure that we can execute regular factory reset without
it by utilizing the logic from shouldWipePersistentDataBlock.
Test: manual verify on aosp build
Bug: 129137473
Bug: 196634851
Change-Id: I2abcb93cbc0872dd920c1dd62152596ddd723691
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com >
2023-06-19 21:06:25 +01: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
b88fbf932a
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:57:23 +00:00
Chaohui Wang
b1231c5f15
Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205
am: 7fdf1c4b17
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910
Change-Id: I9e87eec0995e9dde010a51e3a7ccbaf68839a696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 09:56:38 +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
Chaohui Wang
7fdf1c4b17
Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910
Change-Id: Ia337805f374b7c05bac8902ff9add84ced999f9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 09:17:09 +00:00
Chaohui Wang
6b2f2ab205
Merge "Update the OWNERS for bluetooth & connecteddevice"
2023-06-19 08:29:54 +00:00