SongFerngWang
e7c89d616a
[LE]Gray out the a2dp and hfp when LeAudio is enabled
...
1.Gray out the a2dp and hfp when le audio is enabled
2.When the user disables le audio, then the settings turn on the
a2dp and hfp
3.When the user enables le audio, then the settings turn off the
a2dp and hfp
Bug: 218626162
Test: build pass.
Change-Id: Ic728749112b0047cac291600b3279b9dedbf0b5a
Merged-In: Ic728749112b0047cac291600b3279b9dedbf0b5a
2022-03-16 17:51:22 +08:00
David Magno
351af8ebd1
Crash when scanning WiFi QR code
...
Fix two crashes when scanning a WiFi QR code.
The crashes are due to the asynchronous nature of the scan/decode
process, where the result is delivered after the activity has been
destroyed.
Bug: 223640678
Test: manual, Settings -> Network & internet -> Internet
Press the 'Scan QR code' icon
Start to scan a WiFi QR code
Just before then scan/decode completes, press Back
Change-Id: Ic19ca08590ed76ca9be46eabe3e0b17419fb0b44
2022-03-16 08:53:37 +00:00
Bill Yi
28e4e39cee
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I30a0186f56da191283ace1ff9fde307556d99a69
2022-03-15 22:10:38 +00:00
Bill Yi
ae75e97012
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6d7f03d94b
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17207704
Change-Id: Iaa79e1e6e678cc2e19a85b25328304ca70302628
2022-03-15 21:58:41 +00:00
Bill Yi
6d7f03d94b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7a22f6809906aa7470c04a0bc1b86b544583201f
2022-03-15 21:58:31 +00:00
Android Build Coastguard Worker
86da788df6
Merge cherrypicks of [17129063, 17118783] into sc-v2-release.
...
Change-Id: Ia61e8fa1b1e9e4713a29e790626b4ca280e90cf1
2022-03-15 18:17:50 +00:00
Alex Johnston
875f42e1d3
Change default USB configuration to a RestrictedPreference
...
Test: manual with TestDPC and Settings
DefaultUsbConfigurationPreferenceControllerTest
Bug: 201519976
205996517
Change-Id: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
Merged-In: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
(cherry picked from commit bc4fd99ddb
)
Merged-In: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
2022-03-15 18:16:41 +00:00
lucaslin
c5d1f8d5b1
Hide private DNS settings UI in Guest mode
...
Hide private DNS settings UI in Guest mode to prevent guest
users modifying global private DNS settings.
Bug: 206987762
Test: 1. make RunSettingsRoboTests \
ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
2. Switch to Guest user and check if the private DNS UI is
hidden or not.
Change-Id: Iebfb8684da3be32110decd9e8447dd07b1c40387
(cherry picked from commit 52e863b5a2
)
Merged-In: Iebfb8684da3be32110decd9e8447dd07b1c40387
2022-03-15 18:16:38 +00:00
Eric Biggers
b21d2216ac
Remove support for converting from FDE to FBE
...
Devices that launched with Android 10 or later require FBE (File Based
Encryption) from the beginning, so there's no need to support converting
to FBE after the fact anymore. This was only ever a developer option,
so it probably wasn't used much. And in any case, it's not used
anymore, as isConvertibleToFBE() is hard-coded to return false. Besides
the fact that FBE has been required for several releases now, this
functionality was only ever available on devices that use FDE (Full Disk
Encryption), but FDE support has been removed from Android.
Therefore, remove this unused code.
Bug: 208476087
Change-Id: Ia765d6827e6144153c4e2a253b146ef2c75ca6fe
2022-03-15 17:27:53 +00:00
Timi Rautamäki
46f8b18446
Settings: only set phone number if it's not empty
...
Only set the phone number in Rename mobile network dialog if it's not
empty in order to preserve the ´Not available´ -text.
Test: m, open ´SIMs´ in settings, click Pen-icon to edit SIM, verify
either mobile number or ´Not available´ -text is shown.
Change-Id: I3bc1f1f4eb26cda38e5cc7a12bd4db1bf922f076
2022-03-15 02:11:17 +00:00
Alice Kuo
25c2e31242
Add LE audio hardware offload development option
...
Bug: 197296692
Bug: 215492586
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=BluetoothA2dpHwOffloadPreferenceControllerTest
Change-Id: If1203c50d1d94ac9ed377293b5cb389b7b6f54a1
Merged-In: If1203c50d1d94ac9ed377293b5cb389b7b6f54a1
2022-03-14 03:03:47 +00:00
Treehugger Robot
abb0838f46
Merge "Remove developer option for bluetooth Gabeldorche" am: 4041027433
am: e9e158f469
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2012195
Change-Id: Idbf038ee0d4e060d55cd2140b69ac3e49196a05e
2022-03-14 03:00:09 +00:00
Treehugger Robot
e9e158f469
Merge "Remove developer option for bluetooth Gabeldorche" am: 4041027433
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2012195
Change-Id: I77983e4a010ce777d22b918a0e34632c357283de
2022-03-14 02:36:44 +00:00
Treehugger Robot
4041027433
Merge "Remove developer option for bluetooth Gabeldorche"
2022-03-14 02:06:39 +00:00
Bidhya
c697af1787
Remove developer option for bluetooth Gabeldorche
...
Bug:220175020
Test: Manually verified
Change-Id: I3c37228f7142892f2eb45552f2aced51360651af
2022-03-11 20:56:03 +00:00
Treehugger Robot
6568442e9c
Merge "[Settings] Ignore failed test case" am: c4cc279a2a
am: c4ece27bbb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019376
Change-Id: I3b349e7f8fbda088906e3419d1fee4b5a6882d69
2022-03-11 20:47:14 +00:00
Treehugger Robot
c4ece27bbb
Merge "[Settings] Ignore failed test case" am: c4cc279a2a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019376
Change-Id: Ic9a3e4cb3713df80b4fd431a3fb3f00cb0b13db5
2022-03-11 20:26:19 +00:00
Treehugger Robot
c4cc279a2a
Merge "[Settings] Ignore failed test case"
2022-03-11 20:11:39 +00:00
Bonian Chen
f6124ea5b9
[Settings] Ignore failed test case
...
Ignore failed test case.
Bug: 201021075
Test: build pass
Change-Id: I44ac801ccbd1de0aff7a69534131919e9ef1e732
Merged-In: I44ac801ccbd1de0aff7a69534131919e9ef1e732
2022-03-11 19:08:59 +00:00
Chaohui Wang
b6799b65c7
Merge "Clean up unused profile_select_tablayout." am: aee21e8cbd
am: dc70876ddb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019419
Change-Id: Id0eb4d409cb9a434e608cc255056de08e9428050
2022-03-10 08:22:21 +00:00
Chaohui Wang
dc70876ddb
Merge "Clean up unused profile_select_tablayout." am: aee21e8cbd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019419
Change-Id: Ibb221e416ecc360fb3460ef00defbf35e8abf567
2022-03-10 07:59:55 +00:00
Chaohui Wang
aee21e8cbd
Merge "Clean up unused profile_select_tablayout."
2022-03-10 07:30:04 +00:00
Chaohui Wang
34261e25a7
Clean up unused profile_select_tablayout.
...
Change-Id: If1f58f13a8cf14bf078bce16c23fed6726ff223a
2022-03-10 04:57:00 +00:00
Chaohui Wang
0f1547cb76
Merge "Fix App Compatibility Settings' lifecycle" am: 0ba498b226
am: 7e7924bf35
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010296
Change-Id: I115858d668df4fe332b15081b1b68ed4768ad938
2022-03-10 04:18:12 +00:00
Chaohui Wang
7e7924bf35
Merge "Fix App Compatibility Settings' lifecycle" am: 0ba498b226
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010296
Change-Id: I0dfa53afd25bcd94624f6f79477a4c8b7a1921d2
2022-03-10 03:39:17 +00:00
Chaohui Wang
0ba498b226
Merge "Fix App Compatibility Settings' lifecycle"
2022-03-10 03:20:25 +00:00
Android Build Coastguard Worker
9b43e1e645
Snap for 8282142 from 5db7b3b25f
to sc-qpr3-release
...
Change-Id: I8fb2a556807f3817c7717330ae279d0506ce77cb
2022-03-10 00:08:34 +00:00
TreeHugger Robot
37279f38c0
[automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972
-s ours am: 734d949527
-s ours am: 5db7b3b25f
-s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: Ia65da02df7a81c29d900121fc1df02bb71fc16e4
2022-03-09 18:31:45 +00:00
TreeHugger Robot
f56cc90557
Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-qpr1-dev am: 7b40a559bf
am: 409ac95f00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I2d17216bfbef1df5a06127d4c48f3f2d4e2bdfb0
2022-03-09 18:31:37 +00:00
TreeHugger Robot
5db7b3b25f
[automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972
-s ours am: 734d949527
-s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I94279c39c14d4a69700b67ed679d38cf6b622a9e
2022-03-09 18:12:37 +00:00
TreeHugger Robot
409ac95f00
Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-qpr1-dev am: 7b40a559bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I411e57fb64404c5d0bab966c6d92a62a3d5c5394
2022-03-09 18:12:28 +00:00
TreeHugger Robot
734d949527
[automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972
-s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I35974d0cea6185fac6225093e59b8d0bc65516c0
2022-03-09 18:11:59 +00:00
TreeHugger Robot
f48ae98972
Merge "Change default USB configuration to a RestrictedPreference" into sc-dev
2022-03-09 17:54:27 +00:00
TreeHugger Robot
7b40a559bf
Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-qpr1-dev
...
* changes:
[automerge] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb
Change default USB configuration to a RestrictedPreference
2022-03-09 17:54:27 +00:00
Etienne Ruffieux
b60c038016
Merge "Replced BluetoothCodecStatus creator by Builder" am: 5dd7c32f93
am: 1a8bbc4a85
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2015316
Change-Id: Idd8a5be969d228f501c245d81bdc09b3496f7f5a
2022-03-09 11:32:11 +00:00
Etienne Ruffieux
1a8bbc4a85
Merge "Replced BluetoothCodecStatus creator by Builder" am: 5dd7c32f93
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2015316
Change-Id: Ia92b2ac01bf3e9862738d2c40ae53bf97da35759
2022-03-09 11:01:57 +00:00
Etienne Ruffieux
5dd7c32f93
Merge "Replced BluetoothCodecStatus creator by Builder"
2022-03-09 10:24:16 +00:00
lucaslin
51c66e24f3
Hide private DNS settings UI in Guest mode am: 52e863b5a2
am: 2c1c76cd35
am: 14e88ca2f9
am: 652527b496
am: b38110f853
am: 92245b8f57
am: 1264191233
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: I2f039885b8cb3823cb7da5031ef7931d587564f1
2022-03-09 09:11:08 +00:00
lucaslin
1264191233
Hide private DNS settings UI in Guest mode am: 52e863b5a2
am: 2c1c76cd35
am: 14e88ca2f9
am: 652527b496
am: b38110f853
am: 92245b8f57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: Iadd14a41d26647e13d1f751947d91f3f2a360e84
2022-03-09 08:20:16 +00:00
lucaslin
92245b8f57
Hide private DNS settings UI in Guest mode am: 52e863b5a2
am: 2c1c76cd35
am: 14e88ca2f9
am: 652527b496
am: b38110f853
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: I6947b1c6fb64bf4603ee665ebc44d53fb8f8b77d
2022-03-09 07:44:37 +00:00
lucaslin
b38110f853
Hide private DNS settings UI in Guest mode am: 52e863b5a2
am: 2c1c76cd35
am: 14e88ca2f9
am: 652527b496
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: I7dfbfc73a887027bb55712e2ea05fd01e65bcf96
2022-03-09 07:20:30 +00:00
lucaslin
652527b496
Hide private DNS settings UI in Guest mode am: 52e863b5a2
am: 2c1c76cd35
am: 14e88ca2f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: I8d31577fb64d959949b1c2aed51e482cb54a57ac
2022-03-09 06:55:34 +00:00
lucaslin
14e88ca2f9
Hide private DNS settings UI in Guest mode am: 52e863b5a2
am: 2c1c76cd35
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: I417c9687ae22749f428a902a01612c50cbf0e52c
2022-03-09 06:32:20 +00:00
lucaslin
2c1c76cd35
Hide private DNS settings UI in Guest mode am: 52e863b5a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: I5fc7b5001299b8831a1dd9440b6e25dfaf6d8a98
2022-03-09 06:08:16 +00:00
Chaohui Wang
b4c3817a65
Fix App Compatibility Settings' lifecycle
...
When "Don't keep activities" enabled, it used to be unusable.
Bug: 222226636
Test: On Pixel device
Change-Id: I11718bea90cecfb7ee455fba9059bb09ffb72016
2022-03-09 03:05:47 +00:00
lucaslin
52e863b5a2
Hide private DNS settings UI in Guest mode
...
Hide private DNS settings UI in Guest mode to prevent guest
users modifying global private DNS settings.
Bug: 206987762
Test: 1. make RunSettingsRoboTests \
ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
2. Switch to Guest user and check if the private DNS UI is
hidden or not.
Change-Id: Iebfb8684da3be32110decd9e8447dd07b1c40387
2022-03-09 02:54:12 +00:00
Eric Biggers
e5f19ebc15
[automerger skipped] Merge changes from topic "remove-fde" am: 12ba0209a2
am: fa38c498dc
-s ours
...
am skip reason: Merged-In I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f with SHA-1 1d48df59e5
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945501
Change-Id: I4dc70b56c7a568fa10dfd43a422ccf884690f2bf
2022-03-08 19:34:15 +00:00
Eric Biggers
799f84fd1c
[automerger skipped] Rename crypt_keeper_* strings that are still used am: 64dc746a68
am: cc91b63c1e
-s ours
...
am skip reason: Merged-In Ic63910c870837f5b37e4407ba5b3c7629e925c17 with SHA-1 6167665b8f
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945500
Change-Id: Ia7dc1f1dd76688109812a9daf3c12350c287e2a3
2022-03-08 19:34:13 +00:00
Eric Biggers
31509c8d31
[automerger skipped] Remove CryptKeeperSettings am: 922a11f659
am: 8ec618fc14
-s ours
...
am skip reason: Merged-In I3ce9894291ea1f1886f21980a86a92bfce38038a with SHA-1 9b18c5d081
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945499
Change-Id: I47515daecb8ac43371ad45e08ffd2eafb744d250
2022-03-08 19:34:12 +00:00
Eric Biggers
2ff19ce69b
[automerger skipped] Remove CryptKeeper am: 438c3af097
am: 94ebb2e9e5
-s ours
...
am skip reason: Merged-In I4aaf795e8cee1ff3cdd55a41c975273c8faeefa9 with SHA-1 f8ca0a448c
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945498
Change-Id: Ib73b9312a040da6c953f4335b759f4cc638507f1
2022-03-08 19:34:10 +00:00