Commit Graph

92107 Commits

Author SHA1 Message Date
Treehugger Robot
3378f6e4da Merge "Add LE audio hardware offload development option" am: 3c209b06c0 am: bcb4ee1e8c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1927033

Change-Id: I4d509aab5b501b432bdd6789827945508c7468f0
2022-03-21 06:25:46 +00:00
Treehugger Robot
bcb4ee1e8c Merge "Add LE audio hardware offload development option" am: 3c209b06c0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1927033

Change-Id: I1e710f007fc0b0183b9cac41514aaadbf828bcaf
2022-03-21 05:52:37 +00:00
Calvin Pan
1fd5f8ff5c Add i18n team to localepicker OWNER
Change-Id: I5769d5040958b62d9f29f3a802bf06e10a40ea1d
2022-03-21 05:46:10 +00:00
Treehugger Robot
3c209b06c0 Merge "Add LE audio hardware offload development option" 2022-03-21 05:24:10 +00:00
Eric Biggers
1cc85062cf Remove EXTRA_KEY_TYPE intent data
This intent data was only used by CryptKeeperSettings, which has been
removed.  This is also one of the only remaining users of the
StorageManager.CRYPT_TYPE_* constants which were only ever intended to
be used with vold's Full Disk Encryption APIs, which have been removed.

Bug: 208476087
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
      (No regressions seen; 2 tests fail both before and after.)
Change-Id: Id6e2c0f5ecc79f7372b29393e66ffbd66d52d7a2
2022-03-21 05:09:48 +00:00
Treehugger Robot
bbb9db4149 Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862 am: 0b28adfd8e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626

Change-Id: Ie97da8acc7f25ae088d9ef36932aeb93be30b7cd
2022-03-18 23:11:21 +00:00
Treehugger Robot
0b28adfd8e Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626

Change-Id: I34c53ca0500252de1245691e403327f470d0e293
2022-03-18 22:55:36 +00:00
Treehugger Robot
2f4962c862 Merge "Add null check for mChannel object in WifiP2Settings" 2022-03-18 22:38:19 +00:00
Yibo Wang
e20ddfa5f4 Add null check for mChannel object in WifiP2Settings
When user switch between settings of hotspot(Enable hotspot),
Internet(Enable Wifi) and Wifi-Direct(establish, disconnect and
forgot P2P connection).

mChannel becomes null during WiFi P2P user scenarios resulting
in Settings(com.android.settings) crash on enable Wifi.

This commit fixes mChannel IllegalArgumentException: Channel
needs to be initialized.

Test: manual test
Bug: 218608961
Change-Id: I72c67bcd1086afe2aa8d2c5521107e2d38e5b0bb
2022-03-18 15:08:51 +01:00
Bill Yi
75cce69c9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c0c5c066f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02a68c6262293bdcf21ec90dc7a96ac187041479
2022-03-18 02:50:07 +00:00
Bill Yi
c0e6019a32 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28e4e39cee -s ours
am skip reason: subject contains skip directive

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

Change-Id: I61450277f98ace1bd9e3a9bb06244d18c0f627a8
2022-03-18 02:49:54 +00:00
Bill Yi
c0c5c066f4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-03-18 02:25:29 +00:00
Bill Yi
9b874759b1 Merge changes from topic "presubmit-am-38324c67819045d99732392e5fe804f8" into sc-v2-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6d7f03d94b
  Import translations. DO NOT MERGE ANYWHERE
2022-03-18 02:24:27 +00:00
Tsung-Mao Fang
7052d53fd8 Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9 am: 31c02007ef
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572

Change-Id: I48bad553fd360ab51329e70a9857683014690743
2022-03-17 08:46:38 +00:00
Tsung-Mao Fang
31c02007ef Merge "Settings: only set phone number if it's not empty" am: 19d06e79b9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1920572

Change-Id: I1797a32fe9037755a699c3d402d69d4d557c27c3
2022-03-17 08:14:09 +00:00
Tsung-Mao Fang
19d06e79b9 Merge "Settings: only set phone number if it's not empty" 2022-03-17 07:35:42 +00:00
Mattias Nilsson
aa4ac1e5b9 Do not allow editing of mcc, mnc for carrier id APNs
A user that is allowed to edit mcc, mnc or mvno data can break
the APN list. If a carrier or OEM has added an APN that is
matched with carrier id there is no need to edit those fields.

Apn Editor should not throw any error when a user backs out of
from a carrier id APN where mcc, mnc is empty.

Disable editing of these fields and check for carrier id APN
before adding error message.

Test: Add carrier APN, insert sim and back out from ApnEditor
Bug: 222103038
Change-Id: I4e86cdd3e8caaf3dbfefe9b9f82f11c2804577ff
2022-03-17 06:54:08 +00:00
SongFerng Wang
61aa6e999d Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" am: cfb201c400 am: 704147041b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028084

Change-Id: Ieefa077cbd80848d1d8149c71dc384775a807b0d
2022-03-17 05:00:07 +00:00
SongFerng Wang
100d741cc8 Merge "Add the battery information into device details header" am: 907b3fc4be am: 8ca446a175
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028085

Change-Id: Iacf7f957deb9d3f57088c5bd49e2b0ac70cf88f8
2022-03-17 04:59:47 +00:00
SongFerng Wang
704147041b Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" am: cfb201c400
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028084

Change-Id: I639df2d59da6f2793bec3c89751523778f7cf35b
2022-03-17 03:52:28 +00:00
SongFerng Wang
8ca446a175 Merge "Add the battery information into device details header" am: 907b3fc4be
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028085

Change-Id: Id78a0d42672ff4109449951f755ac68f169dab6b
2022-03-17 03:51:56 +00:00
SongFerng Wang
cfb201c400 Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" 2022-03-17 03:11:24 +00:00
SongFerng Wang
907b3fc4be Merge "Add the battery information into device details header" 2022-03-17 03:11:20 +00:00
Eric Biggers
c749aa3ed1 Merge "Remove support for converting from FDE to FBE" am: 804dc16a03 am: 629db5f9f8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026904

Change-Id: I6d5b12840e9940ecb5d076591ca8514b0085f438
2022-03-16 18:57:35 +00:00
Eric Biggers
629db5f9f8 Merge "Remove support for converting from FDE to FBE" am: 804dc16a03
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026904

Change-Id: Ic08831f723e777c150a672924616184af0d3299f
2022-03-16 18:34:10 +00:00
Eric Biggers
804dc16a03 Merge "Remove support for converting from FDE to FBE" 2022-03-16 18:10:30 +00:00
Treehugger Robot
7ada247bac Merge "Crash when scanning WiFi QR code" am: 6c31283455 am: 7950a0acaf
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2020675

Change-Id: I8e31258422049429a0059159e47930c500f41ecd
2022-03-16 15:53:31 +00:00
Treehugger Robot
7950a0acaf Merge "Crash when scanning WiFi QR code" am: 6c31283455
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2020675

Change-Id: I0cb7773fe6c35a5d46588a64d416d5db50d9eecb
2022-03-16 15:29:30 +00:00
William Escande
cd1d375cbd API Review: factoryReset->clearBluetooth
> Consider renaming the factoryReset method to “clearBluetooth”.

Bug: 222725037
Test: TH
Tag; #refactor

Change-Id: Id42a3344b6ae1a42d0128d2a055b9710f81c4b81
2022-03-16 16:14:11 +01:00
Treehugger Robot
6c31283455 Merge "Crash when scanning WiFi QR code" 2022-03-16 15:03:41 +00:00
SongFerngWang
b76eb99d4a Add the battery information into device details header
Add the new LE audio header
Add the battery information
Update the condition for non-LE audio header

Bug: 218626547
Test: build pass and manualy test
Change-Id: Ib9f4c388c369dc374c43dd399111e02b5555159b
Merged-In: Ib9f4c388c369dc374c43dd399111e02b5555159b
2022-03-16 18:00:50 +08:00
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