Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,321 Commits 1 Branch 0 Tags
d4c0315d66c6be8e2f1595efad8de892605eae7d
Commit Graph

44968 Commits

Author SHA1 Message Date
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
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
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
85c1dea20a Update the OWNERS for bluetooth & connecteddevice 
Bug: N/A
Test: N/A
Change-Id: I72b4b6f47586b2dd13cfcc4a642c817c93e4ded0
 2023-06-19 07:35:20 +00:00
Treehugger Robot
2c73cc8ca8 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: Id3c8af985ccaaa05e29238bc3c0bcda257fe132e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 09:50:45 +00:00
David Magno
50e8eab484 'Mobile plan' is searchable even if it is unavailable 
'Mobile plan' yields a search hit event though the 'Mobile plan'
setting is unavailable on the device.

Bug: 287198186
Test: Manual
Change-Id: Ibc6f01602a364ae902f8a6ce15083890e89446d2
 2023-06-14 16:25:27 +02:00
SongFerng Wang
448c8b61a8 Merge "Remove the owner" am: 286344d539 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2623772

Change-Id: Iad21da9fbcd8d9279c27beb7a7c0761644d8f2b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 05:36:47 +00:00
SongFerngWang
f405dadcf2 Remove the owner 
Bug: 286964921
Test: build pass
Change-Id: I4daf629e8cb994753dca36a811f0d25685df6928
 2023-06-13 15:10:46 +08:00
Joanne Chung
e7b01f0ce8 Merge "Update OWNER file to new owner" am: 6c84f9128d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2618630

Change-Id: Ie7ac04781ba486dd74af1df57a995636453eb21a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 07:23:35 +00:00
Joanne Chung
674ae4ae93 Update OWNER file to new owner 
Bug: 177641730
Change-Id: I68e9986338e04bb81a11a495f6de1657399b5742
Test: n/a. Only update owner
 2023-06-08 06:40:41 +00:00
Jason Chiu
390c348d4b Merge "Do not init dashboard categories when SetupWizard isn't finished yet" am: 428e97cdfa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608473

Change-Id: I3d1b66a4288434d52075538af737c2d1ac33f4e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-02 08:49:21 +00:00
Jason Chiu
2225729ce2 Do not init dashboard categories when SetupWizard isn't finished yet 
The generated category cache during SetupWizard flow is invalid.

Bug: 261885832
Test: manual
Change-Id: Id2108b2cc4ab557b086c4dbbd5dc7722c73e74d3
 2023-06-02 04:55:20 +00:00
Treehugger Robot
381ac521bd Merge "Fix resource leakage caused by cursor" am: 662ba59a47 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608471

Change-Id: Idebb2842aa83cabc6d85e9d277cdb29bbd45362d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-01 22:44:05 +00:00
Cao Peng
38f1b45d50 Fix resource leakage caused by cursor 
Change-Id: I9507658cc82a2b9760507530920a37044f7de2fd
Signed-off-by: Jia Jia <jia.jia@zte.com.cn>
 2023-06-01 18:16:26 +08:00
Lin Yuan
349c845bf4 Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 
When DISALLOW_CONFIG_LOCATION is set, make location service's
MainSwitchPreference pages for wifi scanning and bluetooth scanning
unavailable too, so that intent direct access is disabled.

screenshot: http://shortn/_kkK3BMTSh1

Bug: 277333746
Bug: 277333781
Test: atest SettingsRoboTests, on device
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7591fff234886e79c5d0210a2cf3282a69de9be9)
Merged-In: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39
Change-Id: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39
 2023-05-27 17:13:13 +00:00
Evan Laird
b4d2e7da30 Merge "Set default value of battery percent preference" am: 145caf7d4e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617

Change-Id: I34fe8a73fb89283e44dd46c9c655f8db9353e41b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:37:47 +00:00
Mattias Nilsson
03a0bdd030 Set default value of battery percent preference 
Read config_defaultBatteryPercentageSetting to set default
preference value for battery percentage in SystemUI.

Bug: 189235242
Test: Set resource and check device at boot
Change-Id: I6427a3b76f5641b387dc19f45e17b30820911e3a
 2023-05-04 23:23:48 +00:00
Bill Yi
82c92ce15c Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE 
Merged-In: Ib0806c0bf18797da3e44dbe4800283430120b49a
Merged-In: I865cc944ab660f47b40b48af32a7aef389551963
Merged-In: I4d39e88aca6e31c3e897a0d16ec45124906d63cc

Change-Id: Idb27df03638d87ca39b150dd618cbb5ade831f4c
 2023-05-03 15:54:48 -07:00
Treehugger Robot
c40b06b687 Merge "[Settings] Update code owner" am: 709b27384b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2527125

Change-Id: Ib0806c0bf18797da3e44dbe4800283430120b49a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 09:42:22 +00:00
Treehugger Robot
709b27384b Merge "[Settings] Update code owner" 2023-04-27 09:12:59 +00:00
Treehugger Robot
83f2d27e35 Merge "Fix AppEntry.extraInfo ClassCastException" am: 327867e56b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2564510

Change-Id: I1ad0bc2266bb528fccf3e3e83f4fd06ca47bb3c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 04:25:07 +00:00
Shen Lin
6beffd5bf6 Fix AppEntry.extraInfo ClassCastException 
AppEntry's extraInfo is an Object class, force cast it to Boolean may
cause ClassCastException.

Bug: 279639370
Test: presubmit
Change-Id: Iccbe9b669011c5061f1c8b3998632f05fbd8a02f
 2023-04-26 10:14:22 +00:00
Xin Li
f64573ee7c Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master 2023-04-21 17:40:03 +00:00
Zoey Chen
2fca3dfff0 [Settings] Update code owner 
Bug: NA
Test: build pass
Change-Id: I6885b8655b8b65511beb3d20732335239f7e3a0f
 2023-04-21 03:26:00 +00:00
Diya Bera
33fab7e415 Adding owners 
Test: N/A
Bug: 278741020
Change-Id: Ife62f56fd0e3c83427347365a1eebfad3ec3ed6d
 2023-04-18 22:56:31 +00:00
Chiachang Wang
cd33a0fa88 Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d am: 4770d017dc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499

Change-Id: I7fb125aacace306aec461e64ae7d448dcec10949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 09:54:49 +00:00
Chiachang Wang
4c5334809d Merge "Populate ipsecSecret field in VpnProfile" 2023-04-13 08:53:57 +00:00
chiachangwang
02156d600d Populate ipsecSecret field in VpnProfile 
This commit fixes IKEv2 RSA VPN could not be an always-on VPN
issue to populate ipsecSecret field from "IPsec user certificate".

Fields ipsecUserCert and ipsecSecret are required for a valid
VpnProfile. The ipsecSecret field in VpnProfile should be
populated from "IPsec user certificate" field. It's the matching
private key.

Bug: 263610164
Bug: 230727391
Test: Verify if IKEv2 RSA VPN can setup successfully and set as
      as always on VPN
Change-Id: I605b35fff9e399ee7b82d8441137984992ab2907
 2023-04-13 07:47:53 +00:00
Treehugger Robot
fd8670a4c1 Merge "Merge TQ2A.230405.003" 2023-04-12 17:22:25 +00:00
Treehugger Robot
525b567db3 Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a am: ff6def3c7c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819

Change-Id: I4dfc995e7185c5cb7a599156d71a198bd434cb74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 10:18:17 +00:00
Shen Lin
57b03b309d Align Settings and SystemUI packageName references 
This CL migrated both Settings and SystemUI packageName into Utils.java
to align references.

Bug: 277651621
Test: m Settings -j128
Change-Id: I3d6808de76120a2ddbbed4980b8a65cec81502c9
 2023-04-11 10:27:04 +00:00
Xin Li
e11304fe3d Merge TQ2A.230405.003 
Bug: 271343657
Merged-In: I945490ef1e62af479a732c9a260ed94bdd8bc313
Change-Id: Ib47a648d9e431f09196d292083abd570d33dcd50
 2023-04-10 23:57:24 -07:00
Jason Chiu
2e82189b1a Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev am: d0b0aeb2ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22214366

Change-Id: Icba9b653141d016945a5f999e1f324473d6bd1c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 02:51:54 +00:00
Jason Chiu
d0b0aeb2ba Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev 2023-04-06 02:24:16 +00:00
Jason Chiu
4f7205b2ea Refine permission check process of 2-pane deep link 
- Check the deep link activity instance before redirecting to the
  internal activity for the managed profile invocation, so the caller
  can't bypass the permission check.
- Get the referrer as the caller so that onNewIntent can recognize the
  new caller and check if it has a permission to open the target page.

Test: robotest & manual
Bug: 268193384
Bug: 272437506
Change-Id: Ie69742983fb74ee2316b7aad16461db95ed927c2
Merged-In: Ie69742983fb74ee2316b7aad16461db95ed927c2
 2023-04-06 02:22:45 +00:00
Bonian Chen
e8b96d4b25 [Settings] Avoid from user without sufficient permission to change WiFi am: 61e6c46fa7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21373178

Change-Id: I2f29593b98a41fe4ced1f72dd9523be341850c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 07:32:05 +00:00
Treehugger Robot
06bca85c6a Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a am: 7871a9e9bd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935

Change-Id: I77867e2c59c5745cf8b705072e5b0b35c455f399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 09:34:23 +00:00
Treehugger Robot
60d9be5a0a Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" 2023-03-31 08:20:36 +00:00
Bonian Chen
61e6c46fa7 [Settings] Avoid from user without sufficient permission to change WiFi 
calling

Enhance security control through close UI when accessing by user with
restriction.

Bug: 262390632
Bug: 262243015
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingSettingsTest

Change-Id: I4fadaf2bdc55b97419f9e6abbd3cfa63af034f6a
(cherry picked from commit a1d3fe061e)
Merged-In: I4fadaf2bdc55b97419f9e6abbd3cfa63af034f6a
 2023-03-31 08:15:45 +00:00
Patty Huang
b79d64ee90 Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio" 
Bug: 275388899
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioAllowListPreferenceControllerTest
Change-Id: Ic936eb22aa4f6efd97d3a84b23a44fab83dd09a0
 2023-03-31 12:43:14 +08:00
TreeHugger Robot
3771564adc Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev am: 0362083f3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21367719

Change-Id: I54ad21af66956d5711a72f587d9af4c8389a185f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 01:23:13 +00:00
TreeHugger Robot
0362083f3a Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev 2023-03-31 00:20:15 +00:00
TreeHugger Robot
f02d69dd4f Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478

Change-Id: I6fcc26d5db647b9c36b743592a8b58dda52b1847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:04:20 +00:00
TreeHugger Robot
5bde972e4e Merge "Restrict DataUsageList for guest user" into tm-qpr-dev 2023-03-30 19:08:44 +00:00
TreeHugger Robot
64aa2889d1 Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468

Change-Id: I5565f72a9d96e5212b2db3b57d9978648596fba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 16:30:30 +00:00
TreeHugger Robot
b3599ae3b6 Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902

Change-Id: Ieb852ea9a7963f0407f7a78e38df0050085ffbfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 16:30:11 +00:00
TreeHugger Robot
b6399c95b3 Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev 2023-03-29 19:52:27 +00:00
TreeHugger Robot
23c17977fb Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev 2023-03-29 19:51:37 +00:00