Commit Graph

121892 Commits

Author SHA1 Message Date
Maciej Żenczykowski
905d584b15 Merge "settings: allow enabling ethernet tethering independent of link state" 2023-03-08 03:05:53 +00:00
Ankita Vyas
080e4b02c7 Merge "Add config for display Cloned Apps page in Settings." into udc-dev 2023-03-08 02:48:24 +00:00
Candice Lo
3993306ac7 Merge "Set the settings key when the font size is changed" into udc-dev am: 0290fb1cf3 am: 68d7e80bca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21858523

Change-Id: I78a7cd18625d9164c290df8bd5580dac5cdc384d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 01:55:10 +00:00
Candice Lo
6c4a47413e Merge "Set the settings key when the font size is changed" into udc-dev am: 0290fb1cf3 am: 99a0e22da2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21858523

Change-Id: I1b10ad659d88edb08ec5da668f38121b5cecc6d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 01:54:11 +00:00
Candice Lo
99a0e22da2 Merge "Set the settings key when the font size is changed" into udc-dev am: 0290fb1cf3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21858523

Change-Id: I6b600b28f428b130752e0986c490308d33bcee6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 01:21:44 +00:00
Candice Lo
68d7e80bca Merge "Set the settings key when the font size is changed" into udc-dev am: 0290fb1cf3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21858523

Change-Id: I3211ab9df213d7614f5d400c3326d2a8c9d58cfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 01:18:58 +00:00
Patrick Rohr
6f9062297f settings: allow enabling ethernet tethering independent of link state
A user should be able to enable tethering even if the interface does not
have link yet. Therefore, the toggle should be active if any interface
is available, independent of its link state.

Test: TH
Bug: 234036868
Change-Id: I2ae25207a766d71217dd6d17f3f9b74ceb261238
2023-03-08 00:57:03 +00:00
Candice Lo
0290fb1cf3 Merge "Set the settings key when the font size is changed" into udc-dev 2023-03-08 00:41:02 +00:00
Becca Hughes
1425508aaf [automerger skipped] Merge "Move CredentialProviderInfo for test/settings (settings)" into udc-dev am: 9e2e47c553 am: f4c15c8921 -s ours
am skip reason: Merged-In Ief25f562eb5c2ca4438701de8a8e26941a8370a3 with SHA-1 e174f66a71 is already in history

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

Change-Id: Id2f1ab3f91674c2d69c36238b5350c25de7b6ecd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 23:31:08 +00:00
Becca Hughes
a0edabb7dc [automerger skipped] Merge "Move CredentialProviderInfo for test/settings (settings)" into udc-dev am: 9e2e47c553 am: 6170c608f2 -s ours
am skip reason: Merged-In Ief25f562eb5c2ca4438701de8a8e26941a8370a3 with SHA-1 573e844275 is already in history

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

Change-Id: Ifee561503952253f4188e72125e8174cd6893276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 23:05:39 +00:00
Becca Hughes
6170c608f2 Merge "Move CredentialProviderInfo for test/settings (settings)" into udc-dev am: 9e2e47c553
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546156

Change-Id: I40532c129f0ee3a41b9ce6dcf4eb7097cb67244a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 22:59:59 +00:00
Becca Hughes
f4c15c8921 Merge "Move CredentialProviderInfo for test/settings (settings)" into udc-dev am: 9e2e47c553
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546156

Change-Id: I94e5b6495d8e45584c6bc7f8e11eeb2412da2432
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 22:58:08 +00:00
Julia Reynolds
b678935fc4 [automerger skipped] Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 56e2a08f3f am: 769dc23f37 am: 0cb9c59631 -s ours am: e84f0aeda4 -s ours am: d647dabea4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib264fb8e988e610c83e71dc4e8651f8d98dcf3cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 22:40:48 +00:00
Becca Hughes
9e2e47c553 Merge "Move CredentialProviderInfo for test/settings (settings)" into udc-dev 2023-03-07 22:40:46 +00:00
Valentin Iftime
8a8801f615 [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: fe2ad5085f am: b25fcaab93 am: 1dd5830b05 -s ours am: 0b42ff676a -s ours am: 16ac7dfefe -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib1e0bf3c4bcad089413ae2aada7eace299382a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 22:40:44 +00:00
Iavor-Valentin Iftime
c8931d3400 [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours am: 91ade78763 -s ours am: 89c9dc07df -s ours am: 7a997113d1 -s ours am: 5cd3dc7d1d -s ours am: 66b0c4e41b -s ours am: fa8d8ba74c -s ours am: 67fb12cbfd -s ours am: 6bf58bff25 -s ours am: 5f4d2903ef -s ours
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

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

Change-Id: Ibc4439067bbb5dac97dd0379120617af664259ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 22:35:47 +00:00
Presubmit Automerger Backend
28dedf4268 [automerger skipped] [automerge] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails 2p: 9a7bd79ca3 am: dbd4423d03 -s ours am: 3d35d4f195 -s ours am: d9561eccb6 -s ours am: ca46a99755 -s ours am: 27a594a80a -s ours am: def8d0261d -s ours am: a24080f47f -s ours am: 1141961afe -s ours
am skip reason: subject contains skip directive

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

Change-Id: If5cc9896e67ede3b54e7a66978db7696ab6a8530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 22:33:09 +00:00
Valentin Iftime
5753c8f71c [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: d374ca1324 -s ours am: 34c63adf58 -s ours am: 0fd2472a0a -s ours am: f383a0a176 -s ours am: cf9f09008b -s ours am: ed73e49a2c -s ours am: 7e3d7f7cbb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9a7f82a77b9c99102e1fc7c0a1c17de1fe5431d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 22:22:23 +00:00
Julia Reynolds
4bce2dd9a3 [automerger skipped] Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 56e2a08f3f am: 769dc23f37 am: 0cb9c59631 -s ours am: e84f0aeda4 -s ours am: 962c1fbb00 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I173dd819d495db65f00b10c9673442c226c90d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:58:04 +00:00
Valentin Iftime
a02084fb2b [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: fe2ad5085f am: b25fcaab93 am: 1dd5830b05 -s ours am: 0b42ff676a -s ours am: 8f8d080221 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I79552b41efe8a3b7c0f806fc5155f8547fd3ba7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:58:02 +00:00
Iavor-Valentin Iftime
73b20cd73a [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours am: 91ade78763 -s ours am: 89c9dc07df -s ours am: 7a997113d1 -s ours am: 5cd3dc7d1d -s ours am: 66b0c4e41b -s ours am: fa8d8ba74c -s ours am: 67fb12cbfd -s ours am: 6bf58bff25 -s ours am: bcc677164f -s ours
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

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

Change-Id: I527ded882641cf89f4536a30fe87da7a16db208b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:56:33 +00:00
Presubmit Automerger Backend
44d6c8b36f [automerger skipped] [automerge] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails 2p: 9a7bd79ca3 am: dbd4423d03 -s ours am: 3d35d4f195 -s ours am: d9561eccb6 -s ours am: ca46a99755 -s ours am: 27a594a80a -s ours am: def8d0261d -s ours am: a24080f47f -s ours am: 2ee66f0472 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id66635f11f2b0661205589970eb1899aa3857c4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:54:06 +00:00
Valentin Iftime
f0f8a39c4c [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: d374ca1324 -s ours am: 34c63adf58 -s ours am: 0fd2472a0a -s ours am: f383a0a176 -s ours am: cf9f09008b -s ours am: ed73e49a2c -s ours am: 55ca89a36d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0099e615123e51e5c1f2d346705a21857f87c388
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:51:40 +00:00
Julia Reynolds
d647dabea4 [automerger skipped] Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 56e2a08f3f am: 769dc23f37 am: 0cb9c59631 -s ours am: e84f0aeda4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I960b475282677438d191e0bcd22e95705c72c498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:43:55 +00:00
Valentin Iftime
16ac7dfefe [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: fe2ad5085f am: b25fcaab93 am: 1dd5830b05 -s ours am: 0b42ff676a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e89da484737f6a16c6c9be4a073b2587839f2af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:43:41 +00:00
Iavor-Valentin Iftime
5f4d2903ef [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours am: 91ade78763 -s ours am: 89c9dc07df -s ours am: 7a997113d1 -s ours am: 5cd3dc7d1d -s ours am: 66b0c4e41b -s ours am: fa8d8ba74c -s ours am: 67fb12cbfd -s ours am: 6bf58bff25 -s ours
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

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

Change-Id: I077165d521212bbf115f1f380ac10bfe2e29e1d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:40:31 +00:00
Presubmit Automerger Backend
1141961afe [automerger skipped] [automerge] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails 2p: 9a7bd79ca3 am: dbd4423d03 -s ours am: 3d35d4f195 -s ours am: d9561eccb6 -s ours am: ca46a99755 -s ours am: 27a594a80a -s ours am: def8d0261d -s ours am: a24080f47f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3ea3744bbe9991e03d31cbf2ea1448d8193196b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:38:19 +00:00
Julia Reynolds
962c1fbb00 [automerger skipped] Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 56e2a08f3f am: 769dc23f37 am: 0cb9c59631 -s ours am: e84f0aeda4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I178745eb447d4349e404b55c75b4eef74d0b2288
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:34:21 +00:00
Valentin Iftime
8f8d080221 [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: fe2ad5085f am: b25fcaab93 am: 1dd5830b05 -s ours am: 0b42ff676a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id5227c73c1f4421abff0439149269abf871bc955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:34:16 +00:00
Valentin Iftime
7e3d7f7cbb [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: d374ca1324 -s ours am: 34c63adf58 -s ours am: 0fd2472a0a -s ours am: f383a0a176 -s ours am: cf9f09008b -s ours am: ed73e49a2c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5ae3afbd925b1396d302b2ff433fe0e87c2c075f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:34:09 +00:00
Iavor-Valentin Iftime
bcc677164f [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours am: 91ade78763 -s ours am: 89c9dc07df -s ours am: 7a997113d1 -s ours am: 5cd3dc7d1d -s ours am: 66b0c4e41b -s ours am: fa8d8ba74c -s ours am: 67fb12cbfd -s ours am: 6bf58bff25 -s ours
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

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

Change-Id: I921732cb148e9a4dac20decf7e0a346e40c21031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:32:23 +00:00
Julia Reynolds
e84f0aeda4 [automerger skipped] Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 56e2a08f3f am: 769dc23f37 am: 0cb9c59631 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I05e42da71f9c3dc7ebed33cc511d2c773ea48daf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:24:20 +00:00
Valentin Iftime
0b42ff676a [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: fe2ad5085f am: b25fcaab93 am: 1dd5830b05 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaaee2a2cb381616fb44c78e48d8956df187650c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:23:55 +00:00
Iavor-Valentin Iftime
6bf58bff25 [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours am: 91ade78763 -s ours am: 89c9dc07df -s ours am: 7a997113d1 -s ours am: 5cd3dc7d1d -s ours am: 66b0c4e41b -s ours am: fa8d8ba74c -s ours am: 67fb12cbfd -s ours
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

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

Change-Id: Ieab49e4788480ca22ddc26998640fa1c2955146e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:20:24 +00:00
Presubmit Automerger Backend
2ee66f0472 [automerger skipped] [automerge] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails 2p: 9a7bd79ca3 am: dbd4423d03 -s ours am: 3d35d4f195 -s ours am: d9561eccb6 -s ours am: ca46a99755 -s ours am: 27a594a80a -s ours am: def8d0261d -s ours am: a24080f47f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee626de130c58eeab8517686aff2e9fc2853bfe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:13:57 +00:00
Valentin Iftime
55ca89a36d [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: d374ca1324 -s ours am: 34c63adf58 -s ours am: 0fd2472a0a -s ours am: f383a0a176 -s ours am: cf9f09008b -s ours am: ed73e49a2c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7d0e601abfa4f29691c061cef5097e70c9ee875c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:13:38 +00:00
Presubmit Automerger Backend
a24080f47f [automerger skipped] [automerge] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails 2p: 9a7bd79ca3 am: dbd4423d03 -s ours am: 3d35d4f195 -s ours am: d9561eccb6 -s ours am: ca46a99755 -s ours am: 27a594a80a -s ours am: def8d0261d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9a458d6df499022ed9ded204e344397e8d311d4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:13:35 +00:00
Automerger Merge Worker
04ceedcf61 Merge "Merge "Add LE Audio allow list feature switcher in the developer option menu" am: 5bb798f518 am: 0086b200d0 am: ced8230ee9 am: 9745460cad am: ff16a5f033" 2023-03-07 20:54:46 +00:00
Patty Huang
1674f03529 Merge "Add LE Audio allow list feature switcher in the developer option menu" am: 5bb798f518 am: 0086b200d0 am: ced8230ee9 am: 9745460cad am: 41129ad8f6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2387973

Change-Id: Ice5b18be07ba9497fb702ba7447ed8bcdcb3d257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 20:54:28 +00:00
Patty Huang
6b7ad3baeb Merge "Add LE Audio allow list feature switcher in the developer option menu" am: 5bb798f518 am: 0086b200d0 am: ced8230ee9 am: 9745460cad am: ff16a5f033
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2387973

Change-Id: I72d8c6e52e1dfdb2c78933367390e66786812fd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 20:54:26 +00:00
Julia Reynolds
4bb32ee56f Don't show NLSes with excessively long component names
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-07 15:46:29 -05:00
Valentin Iftime
ed73e49a2c [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: d374ca1324 -s ours am: 34c63adf58 -s ours am: 0fd2472a0a -s ours am: f383a0a176 -s ours am: cf9f09008b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3aa4a584e42eef11cc12c790488aff284cd93acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 20:44:33 +00:00
Patty Huang
41129ad8f6 Merge "Add LE Audio allow list feature switcher in the developer option menu" am: 5bb798f518 am: 0086b200d0 am: ced8230ee9 am: 9745460cad
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2387973

Change-Id: I48a46d9c549756176884690f011641cf28f3a041
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 20:17:21 +00:00
Patty Huang
ff16a5f033 Merge "Add LE Audio allow list feature switcher in the developer option menu" am: 5bb798f518 am: 0086b200d0 am: ced8230ee9 am: 9745460cad
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2387973

Change-Id: If01014be9fd1c2d8a5f52b41e4f815a95e64883d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 20:17:21 +00:00
Treehugger Robot
c894906a05 [automerger skipped] Merge "Add getSubscriptionId API" am: 7813c4a9a3 am: 5e84729b10 am: 98a648d4f2 -s ours am: 3e7889ce0d -s ours am: e156d81b9f -s ours
am skip reason: Merged-In I0a43d33daf523e6f0bea054c8965281bafbbcaa4 with SHA-1 f4982a080b is already in history

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

Change-Id: Ia462dac7c57a550e7991a45eab75c32514d7fb9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 19:52:51 +00:00
Treehugger Robot
fa13bd1499 [automerger skipped] Merge "Add getSubscriptionId API" am: 7813c4a9a3 am: 5e84729b10 am: 98a648d4f2 -s ours am: 3e7889ce0d -s ours am: 75d984c200 -s ours
am skip reason: Merged-In I0a43d33daf523e6f0bea054c8965281bafbbcaa4 with SHA-1 f4982a080b is already in history

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

Change-Id: I33bd994f0f6c78bf8054f5128b1d409e08b22126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 19:52:04 +00:00
Patty Huang
9745460cad Merge "Add LE Audio allow list feature switcher in the developer option menu" am: 5bb798f518 am: 0086b200d0 am: ced8230ee9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2387973

Change-Id: I30cf2f5e5fcf534877986839aba2f908b8f3b461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 19:44:08 +00:00
Treehugger Robot
e156d81b9f [automerger skipped] Merge "Add getSubscriptionId API" am: 7813c4a9a3 am: 5e84729b10 am: 98a648d4f2 -s ours am: 3e7889ce0d -s ours
am skip reason: Merged-In I0a43d33daf523e6f0bea054c8965281bafbbcaa4 with SHA-1 f4982a080b is already in history

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

Change-Id: I8d57c15841efe6546f32a81501af96e6346980db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 19:29:44 +00:00
Treehugger Robot
75d984c200 [automerger skipped] Merge "Add getSubscriptionId API" am: 7813c4a9a3 am: 5e84729b10 am: 98a648d4f2 -s ours am: 3e7889ce0d -s ours
am skip reason: Merged-In I0a43d33daf523e6f0bea054c8965281bafbbcaa4 with SHA-1 f4982a080b is already in history

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

Change-Id: I3b1ac610de89529fb068f70d1158791f814f6830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 19:29:10 +00:00
Treehugger Robot
3e7889ce0d [automerger skipped] Merge "Add getSubscriptionId API" am: 7813c4a9a3 am: 5e84729b10 am: 98a648d4f2 -s ours
am skip reason: Merged-In I0a43d33daf523e6f0bea054c8965281bafbbcaa4 with SHA-1 f4982a080b is already in history

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

Change-Id: I63e0e83bad08da0869f07ae4b58c18f2e80cd874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 19:00:10 +00:00