Justin McClain
5f8aeeb9ef
Adding owners file.
...
Test: m
Change-Id: I0b32a9bc0e9be65b3d2ff0ac07d79baa05305205
2023-08-01 13:44:22 +00:00
Treehugger Robot
9a44907d9e
Merge "Match APN types with ignoring the case" into main am: 720fd136ed
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056
Change-Id: I502a8c1c156c26bb68f73afc4a2c5d438aef5dd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 04:47:15 +00:00
Treehugger Robot
720fd136ed
Merge "Match APN types with ignoring the case" into main
2023-07-26 04:03:19 +00:00
Hideki Ishii
8bce735fa0
Match APN types with ignoring the case
...
Currently APN types which are set on ApnEditor are compared with the
types which are configured with read_only_apn_types_string_array in a
case-sensitive manner. So upper case types such as "DUN" or "IMS" can be
set if read_only_apn_types_string_array is configured as "dun" or "ims."
Then the APN with types such as "DUN" or "IMS" can be added and may be
used for the network connection unintentionally.
This patch compares APN types with ignoring the case on ApnEditor to
prevent the problem above.
Bug: 200194310
Test: Manual test passed
Change-Id: I0f68bf470699df388855ec7277c0cfc24a2c30ba
2023-07-21 15:49:02 +09:00
Jin Dong
7f177801eb
Crash occurs when entering a Bluetooth broadcast password
...
BT crashes when entering a password longer than 16 characters.
Limit the password length to 16 characters.
Fixes: 292053940
Test: Manual
Change-Id: I1ed2cfc33c3b0dbdcf2a9c865b748b6376bce1bc
2023-07-20 15:15:34 +02:00
Android Build Coastguard Worker
2763408d3c
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23726247'] into udc-release.
...
Change-Id: Ibc906c14827b8b212d66311c149ac4fb9f1e2895
2023-07-18 04:35:59 +00:00
Matías Hernández
d55910971e
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
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:027f0a46aee333ba29b904cf366c9d81794cf088 )
Merged-In: Ifc048311746c027e3683cdcf65f1079d04cf7c56
Change-Id: Ifc048311746c027e3683cdcf65f1079d04cf7c56
2023-07-18 04:32:21 +00:00
Treehugger Robot
70b29d5f28
Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main am: 24db817a65
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2597316
Change-Id: If8911bebafd144d8870dd7c2b8afc7e5820eca31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 22:40:10 +00:00
Treehugger Robot
24db817a65
Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main
2023-07-12 22:03:16 +00:00
Bill Yi
e70f33f687
[automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: d4c0315d66
-s ours
...
am skip reason: Merged-In I2d14107a37340b8b34ae71c67f7f705a272324b9 with SHA-1 c61819e807
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: Ib15065dff3e0f03f45cfc124711808f32e6d2096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 14:10:45 +00:00
Bill Yi
3e01c01021
[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 05c15f8e73
-s ours
...
am skip reason: Merged-In I2d14107a37340b8b34ae71c67f7f705a272324b9 with SHA-1 c61819e807
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: I6db943e35499a5b56c80a8277af182085ae0ff4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 14:10:24 +00:00
Bill Yi
d4c0315d66
Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main
2023-07-12 13:38:40 +00:00
Bill Yi
05c15f8e73
Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE
...
Merged-In: I2d14107a37340b8b34ae71c67f7f705a272324b9
I2d14107a37340b8b34ae71c67f7f705a272324b9
Merged-In: I302a25ff6f386b4b533354fcb841abd01aa1d837
I302a25ff6f386b4b533354fcb841abd01aa1d837
Merged-In: Idd06d93032c0616c59f6f9738a2f5dea9fc9e53c
Idd06d93032c0616c59f6f9738a2f5dea9fc9e53c
Change-Id: Ie7d523720aff6d3ac1879130df097474e417d215
2023-07-11 15:30:02 -07:00
Android Build Coastguard Worker
ab0b6f499f
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23768006', 'googleplex-android-review.googlesource.com/23830044'] into udc-release.
...
Change-Id: I390edfa996a68fe74e241aab5ab927a74fd008b1
2023-07-05 23:28:17 +00:00
Michael Mikhail
9a23de2531
Trigger talkback for notification volume change
...
Triggers talkback to say the content description of the title of
notification volume when notification volume is set to vibrate or silent
mode.
Fixes: 285453719
Fixes: 285455826
Test: manually checked when the ring volume is set to 0% and when the
notification volume is set to 0%. Check the video in the bug link.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6308e3fb2a3ff6bf00bb02b133678fe4fee37f5d )
Merged-In: I4bd65bdbfa41793fc8e32c295185363ca36cc0d7
Change-Id: I4bd65bdbfa41793fc8e32c295185363ca36cc0d7
2023-07-05 23:27:41 +00:00
Michael Mikhail
2b49d000b6
Add content description to volume title in settings.
...
Adds content description that is announced by talkback when a11y focus
is on volume preference. This improves talkback announcement when view changes.
Fixes: 285529113
Bug: 285455826
Fixes: 285487766
Test: atest VolumeSeekBarPreferenceControllerTest
Test: atest VolumeSeekBarPreferenceTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:499f965c1c79cea14377c37028133a9f8717693d )
Merged-In: Ibe80b4b1d489dc058df1cc79c96b034d5ddc6e56
Change-Id: Ibe80b4b1d489dc058df1cc79c96b034d5ddc6e56
2023-07-05 23:27:34 +00:00
Android Build Coastguard Worker
84e2fc0e79
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23667755'] into udc-release.
...
Change-Id: I1ba0b3f6fb4038dc836e0bc0abb7b199f76fce36
2023-06-29 03:40:24 +00:00
Grace Cheng
e8a85a2765
Fix NPE in updateAddPreference
...
Update mAddFingerprintPreference to avoid NPE
Fixes: 286495189
Test: Rotate screen during first fingerprint enrollment, complete enrollment, and observe no crash
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f58714496ab5454ea10c6d638c094bb1d21306d8 )
Merged-In: Id7edde492168b467360c6c99b326721cd883bba8
Change-Id: Id7edde492168b467360c6c99b326721cd883bba8
2023-06-29 03:39:21 +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
Android Build Coastguard Worker
5b9c3292d4
Snap for 10367700 from 3f85afaad5
to udc-release
...
Change-Id: I2608b8bf4d6950a8256918da52c48f4508a94be1
2023-06-22 23:18:46 +00:00
TreeHugger Robot
1485ceaf97
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23773145
Change-Id: I17a6c8a571b4a0b7d943dfd710cde0f18d03da39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 08:09:42 +00:00
Bill Yi
422c0622e8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23773145
Change-Id: Ib724a8c68b2b9ec7fb438719c227094605d3efac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 08:09:30 +00:00
Bill Yi
121dcd4d85
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23773144
Change-Id: I14a0dc3b2435e511beec62e65281374249e704f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 08:09:10 +00:00
TreeHugger Robot
3f85afaad5
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-22 07:13:52 +00:00
Bill Yi
65122fc3d2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaff205a3b097d4239074e483525f0ab12f97d493
2023-06-21 16:33:47 -07:00
Bill Yi
588001801a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic6f318bc10b367849754f16f9c02a9aa75a24b74
2023-06-21 16:32:09 -07:00
Android Build Coastguard Worker
ec3f3a2740
Snap for 10360508 from bfde831c44
to udc-release
...
Change-Id: Ia37a7fc1e4216af813b7b59668f271e8419858e5
2023-06-21 23:19:48 +00:00
Xin Li
3e6b213e75
Merge Android 13 QPR3
...
Bug: 275386652
Merged-In: I11e6110ba0b640be8b373d9afd45f806c005b05f
Change-Id: I885fdb1d60c595314c9f3ed229dc030a75edab00
2023-06-21 15:16:07 -07:00
Bill Yi
196592ee78
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I7b5c0743698cc167f7852176ed4f619cb515902b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 20:39:03 +00:00
Bill Yi
1ca0379e99
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I626aca749292a50a5c1eb0755d4801cefd85ca0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 20:38:58 +00:00
Bill Yi
e6bbf4c0ab
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765255
Change-Id: Ic1355b8c0575e2d4cae4a1ebe2284d4fcbca5009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 20:38:47 +00:00
Bill Yi
bfde831c44
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-21 19:19:29 +00:00
Bill Yi
6072ca10ec
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8c5e78d87373a142a4082f9081a28027d239af45
2023-06-21 07:16:56 -07:00
Bill Yi
b37162ce4a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia31b10a26fde9ae0f51940ad59e4746ead5fa70b
2023-06-21 07:15:19 -07:00
Treehugger Robot
3cc206bb14
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: If6db3e162b26a8ab0355ba8c39834756850a89f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:36:44 +00:00
Bill Yi
c8daf1ce7c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I0b4e859b86c5039e4aebd961d5e0fd476c73cf4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:36:41 +00:00
Bill Yi
9c5a967922
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754632
Change-Id: Ieabe6679580ea0eb03115372f46ec06be1925f5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:36:15 +00:00
Treehugger Robot
8e3c231438
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-21 06:19:35 +00:00
Bill Yi
dd95a8a7c8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3c3068ef9ae4cfd121798c3247328a8ebaadf22a
2023-06-20 19:30:31 -07:00
Bill Yi
d0213cd684
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7725eba9eba2160e5a330d92a312f45d677b91a7
2023-06-20 19:28:50 -07:00
Android Build Coastguard Worker
fbbb5011c9
Snap for 10353861 from bd74e47e5e
to udc-release
...
Change-Id: I7d994d93eee12e416a49f2963ba07a7f121e26d3
2023-06-21 01:23:52 +00:00
Julia Tuttle
ee0d1171aa
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: Ieaf111aae95150c6c7480ee0693478be934d6353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:06:47 +00:00
Julia Tuttle
bd74e47e5e
Merge "Fix colors in importance and conversation priority preferences" into udc-dev
2023-06-20 16:21:01 +00:00
Treehugger Robot
975e782dd4
Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97
am: 45918b72bf
am: e1858cab06
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212
Change-Id: I4b486b4da6d99522ab004876fb1abdc2f45766dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 14:37:21 +00: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
YK Hung
5007841ebd
Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285
Change-Id: Id6b352d47918565fac42659529c97d1b4c89606f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 07:01:29 +00:00