Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,817 Commits 1 Branch 0 Tags
c58030dcb092dafd8a8b5a508ca1275392660fb0
Commit Graph

49978 Commits

Author SHA1 Message Date
Hansen Kurli
c58030dcb0 Merge "Catch UnsupportedOperationException of startLegacyVpn" into main am: 485e8800ed am: 3a33f7178f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2822270

Change-Id: I781d4ca1e43869586543737ad357093630202319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-13 06:52:32 +00:00
Hansen Kurli
3a33f7178f Merge "Catch UnsupportedOperationException of startLegacyVpn" into main am: 485e8800ed 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2822270

Change-Id: I84a308d94aed266f5125977cd7a385c315a72047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-13 06:05:58 +00:00
Hansen Kurli
485e8800ed Merge "Catch UnsupportedOperationException of startLegacyVpn" into main 2023-11-13 05:27:07 +00:00
Treehugger Robot
713c324cee Merge "Validate ringtone URIs before setting" into udc-dev am: 410fe2f16e am: e808116b30 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24969251

Change-Id: Iac60d9e5d71e6c544ee4b4d2224e3c2bc1cae051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 20:18:08 +00:00
Treehugger Robot
e808116b30 Merge "Validate ringtone URIs before setting" into udc-dev am: 410fe2f16e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24969251

Change-Id: I974f2442cb132cc97bdd843fbc3840e268f361fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 18:42:27 +00:00
Treehugger Robot
410fe2f16e Merge "Validate ringtone URIs before setting" into udc-dev 2023-11-08 18:05:31 +00:00
Hansen Kurli
eea7c3c8d5 Catch UnsupportedOperationException of startLegacyVpn 
startLegacyVpn may throw UnsupportedOperationException. Instead
of crashing Settings, catch the exception and show a Toast.

Bug: 161776767
Test: Manual test, connect legacy vpn profile and observe Toast.
Change-Id: I5947f2043aa68478f659b34531202f225eab4568
 2023-11-08 20:39:00 +08:00
SongFerng Wang
bc4909cafd Merge "Fix the burst callback issue on the repository" into main am: a23320eedd am: 4362f09737 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2780887

Change-Id: I69a30d3d6af7b75177cee4c259786b7acbfdd5cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-07 10:11:00 +00:00
SongFerng Wang
5ec0fa333c Merge "Fix the burst callback issue on the repository" into main am: a23320eedd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2780887

Change-Id: I5d83bd6ea2f3f44aa961c0a77aa64c1275f4b268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-07 09:43:39 +00:00
SongFerng Wang
4362f09737 Merge "Fix the burst callback issue on the repository" into main am: a23320eedd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2780887

Change-Id: Ia0f4f76a704973e123cfe5e4c2d571bbea0c861f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-07 09:41:19 +00:00
SongFerng Wang
a23320eedd Merge "Fix the burst callback issue on the repository" into main 2023-11-07 09:11:06 +00:00
Treehugger Robot
e79bdaef63 Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75 am: 3521df9dca 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325

Change-Id: Ic739f9650dcfe638521dc0488c397ef9b8fa5ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-07 05:18:50 +00:00
Treehugger Robot
f19320aca6 Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325

Change-Id: I71614129cf95ac29f845dadf479135dcb3a5a48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-07 04:52:27 +00:00
Treehugger Robot
3521df9dca Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325

Change-Id: I0ac76dbfb034e1a9856b231aa59b3ec0197914d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-07 04:48:36 +00:00
Treehugger Robot
85ca373e75 Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main 2023-11-07 04:08:35 +00:00
Evan Chen
d72a0ec505 Merge "Make sure work profile app cant enable notification listener services" into udc-qpr-dev am: 857047f804 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008425

Change-Id: Ia1193710342c11b9a6809f5379405754fd061859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 20:18:11 +00:00
Evan Chen
582edbd719 Make sure work profile app cant enable notification listener services am: aa122da7d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537

Change-Id: Ib3ad3f5e10a9cdafa7580b64c67117f1a1f19d19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 20:13:37 +00:00
Evan Chen
857047f804 Merge "Make sure work profile app cant enable notification listener services" into udc-qpr-dev 2023-11-06 19:15:32 +00:00
Mengjun Leng
1871b8155f Fix the burst callback issue on the repository 
Prevents the callback when no sub entities changed to reduce
UI jank, besides, makes both variables mAvailableSubInfoEntityList
and mActiveSubInfoEntityList thread-safe.

Test: Manual
Bug: 279387799

Change-Id: I04f2a780de54e7528be6aeaf62bc8162e499aa97
 2023-11-02 07:18:54 +05:30
Chaohui Wang
e9502c3cc4 Merge "When device has a call, avoid user inactive/active SIM." into udc-qpr-dev am: aab495929f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25220520

Change-Id: If895e308ce90330c33d6ceaa7551768d0771dce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-31 22:53:24 +00:00
Roshan Pius
ad01bf88a7 settings(payments): Use newly exposed formal API for CardEmulation.getServices() 
Bug: 307352220
Test: Compiles
Merged-In: Iaaa37a8e55d755f8abcbaa26c31bf7962e166e96
Change-Id: Iaaa37a8e55d755f8abcbaa26c31bf7962e166e96
 2023-10-31 18:19:37 +00:00
tom hsu
61e7550e7e When device has a call, avoid user inactive/active SIM. 
Bug: 296314216
Test: atest passed
Change-Id: I1a717d24a87316ccf065a2c02c49dc7e29825905
(cherry picked from commit e7d98dea9d)
Merged-In: I1a717d24a87316ccf065a2c02c49dc7e29825905
 2023-10-31 03:08:41 +00:00
Treehugger Robot
767ff4725e Merge "settings(nfc): Remove NFC beam settings" into main am: e8df63f148 am: ff03ce88ff 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2808364

Change-Id: I981cda69be0ada11eedf478ee4ede362c3858a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 21:28:55 +00:00
Treehugger Robot
3510cd0a6e Merge "settings(nfc): Remove NFC beam settings" into main am: e8df63f148 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2808364

Change-Id: I259e0d59f346e5e99e34453405fa5c4cc622c92a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 21:04:17 +00:00
Treehugger Robot
ff03ce88ff Merge "settings(nfc): Remove NFC beam settings" into main am: e8df63f148 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2808364

Change-Id: Ic8c0f7ceec443aca5172cd38ede765781640dc0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 21:03:30 +00:00
Roshan Pius
ad565c49dc settings(nfc): Remove NFC beam settings 
This API was already deprecated and not supported for a few years. The
API was completely removed in Android U (see b/236980291).

Bug: 307352220
Test: Verified NFC settings works correctly
Merged-In: I40974a26d170cf3eeec18e6a07a21f6c420eca9e
Change-Id: I40974a26d170cf3eeec18e6a07a21f6c420eca9e
 2023-10-30 19:42:47 +00:00
Cassie Wang
16677a5492 Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4 am: 16e99c187f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406

Change-Id: I25a47d376b7fa31a144cdc74bee6c9a99a6b2525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 06:31:50 +00:00
Cassie Wang
ccdd06e496 Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406

Change-Id: Ie98613fd98bfac9f620dd6755e5a118a3433c171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 06:15:05 +00:00
Cassie Wang
16e99c187f Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406

Change-Id: Ib8a236bd666204b48faac0189fbcc1acfcb3e8ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 06:13:58 +00:00
Cassie Wang
5abd3420c4 Merge "Add a config to show the Vpn options menu." into main 2023-10-23 05:53:32 +00:00
Anthony Zhang
8155c507f2 Merge "Add pace for UdfpsEnrollHelper" into udc-qpr-dev am: c9606ad732 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24755290

Change-Id: I5d7c5820749057aeecee9c21eb62f8c6d480ce5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 20:59:55 +00:00
Anthony Zhang
c9606ad732 Merge "Add pace for UdfpsEnrollHelper" into udc-qpr-dev 2023-10-20 20:40:59 +00:00
Treehugger Robot
c200d097e9 Merge "Only allow clearing of Euicc Data by owner or demo user" into main am: f1cbe74e08 am: ad49e33f01 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2264402

Change-Id: I46d8bdaac17ed33fffedeefbfbfc01e1aa1b145c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 09:47:35 +00:00
Treehugger Robot
ce0d7e1c61 Merge "Only allow clearing of Euicc Data by owner or demo user" into main am: f1cbe74e08 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2264402

Change-Id: I696de52a418fd1f02291d9ef811d989f5b4e25a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 09:10:21 +00:00
Treehugger Robot
ad49e33f01 Merge "Only allow clearing of Euicc Data by owner or demo user" into main am: f1cbe74e08 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2264402

Change-Id: Iaf9eed774382c735bed78f43451b89b61b4e275e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 09:08:47 +00:00
Edward Savage-Jones
922fc6067d Only allow clearing of Euicc Data by owner or demo user 
Secondary users should not be able to erase downloaded SIMs
is a similar way that they are not be able to factory reset
the device.

Bug: 303488763
Test: On a device with FEATURE_TELEPHONY_EUICC enabled,
      create secondary user, enter Settings->System->Reset Options
      there should be no option to 'Erase downloaded SIMs'
Change-Id: I4f5326732822bc322ab13a00937f94232ca69228
 2023-10-20 08:20:01 +02:00
Bill Lin
624ebae395 Merge "Revert fixing the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev am: 2943132aff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24942007

Change-Id: Ic76d9917222bdab7ce268639ac622409fab677c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 00:38:06 +00:00
Bill Lin
2943132aff Merge "Revert fixing the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev 2023-10-19 23:37:35 +00:00
Xin Li
7b262e34b7 Merge "Merge 10952656" into aosp-main-future 2023-10-19 17:58:36 +00:00
Jason Chang
fdf80bd5c9 Revert fixing the style of Choose screen lock wasn’t consistent 
in initial setup and deferred setup

Bug: 301383804

Test: manually test with reproduciable steps in PO mode:
1. Set up offline and skip initial setup.
2. Navigate to home screen.
4. Connect to WiFi.
3. Sign in corp account during deferred setup.
5. Navigate to screen lock setup.
4. When landing on Choose screen lock, observe the behavior.

Change-Id: I5d9d1d30d280311875d8bd8604aed0fd0c08ab2c
 2023-10-19 11:05:24 +00:00
Eric Biggers
81afb5c097 Merge "Unlock non-secure users automatically (2/2)" into main am: fcaf0aceeb am: 3eb12fab5e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2661955

Change-Id: I72d1606782200e7f1b16a0617439b38c4916523e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 00:33:18 +00:00
Eric Biggers
48e63162ef Merge "Unlock non-secure users automatically (2/2)" into main am: fcaf0aceeb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2661955

Change-Id: I77def55762894cf041e3b5f5eff6ec5552403f3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 00:05:43 +00:00
Eric Biggers
fcaf0aceeb Merge "Unlock non-secure users automatically (2/2)" into main 2023-10-18 23:50:43 +00:00
Xin Li
596efc7e94 Merge 10952656 
Merged-In: Ib02ae9caef06a46938947806dac8aabb1fa12d94
Change-Id: Ib1f728fef6241ddd7a2ce1522093f4a62a4a9d81
 2023-10-18 15:11:48 -07:00
Treehugger Robot
ab099dfcf6 Merge changes from topic "angle-developer-option-toggle1" into main am: 0481d6a318 am: c711d1c39a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794056

Change-Id: Icca52680a21a4e5c86edacc1bab137dbca34846d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 21:09:15 +00:00
Treehugger Robot
edc1304cc5 Merge changes from topic "angle-developer-option-toggle1" into main am: 0481d6a318 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794056

Change-Id: I62d88700fe6c8110dd0e70b39d6ed42a6a88fb8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 20:39:26 +00:00
Peiyong Lin
e92284ced1 [Cherry-pick] Add debug property to safe guard ANGLE developer option UI. am: 3182b0e298 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794055

Change-Id: If12eaf605c7e85da20bbcd48ccf3f855e744091d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-18 20:39:23 +00:00
Arnab Sen
ae0261e220 Unlock non-secure users automatically (2/2) 
...while moving apps or media content from internal storage to
adopted storage and vice-versa.
Currently, for FBE enabled devices, whenever move is triggered for
either app or media content, there is a prompt for user to enter their
lockscreen credentials in order to unlock storage if the user has one.
But if the user does not have a lockscreen credential set and is not
running,the wizard page is stuck. This leads to a bad user experience.

StorageWizardMigrateConfirm & StorageWizardMoveConfirm uses
ChooseLockSettingsHelper to launch the authentication method set by the
user in order to unlock the storage. But, it does not handle the
use-case where user has no authentication set and not running, causing
return to the wizard activities, thus blocking the flow. This CL solves
the issue by, checking if the user is not secure, attempt unlock the
storage otherwise prompt the user to unlock.

Bug: 305978187
Test: manual
Steps
 1. Create multiple users with atleast one user with an authentication
   method setup and one without authentication (apart from system user)
 2. Install same apps for all users and also add some content to the
    media storage.
 3. Format an SD Card as adopted.
 4. Attempt to move content.
 5. Check that the wizard is not stuck and it is prompting the locked
    users to authenticate.
 6. Reboot
 7. After reboot, Go to Settings > All Apps > app_name
    > Storage & Cache
 8. Tap on "Change" under Storage and Select Adopted storage.
 9. Check the same as Step#5

Change-Id: Ib72e9073386457711cc1d2ba745a24cbea91cd8a
 2023-10-18 23:26:28 +05:30
Peiyong Lin
34d308924e [Cherry-pick] Allow ANGLE developer option toggle UI enabled if ANGLE is enabled. 
Previously the ANGLE developer option toggle UI was disabled by default
and a user would need to use adb command to set the debug property to
true to enable it, and every reboot would reset the debug property to
false again and hence disable the toggle UI again. However, since ANGLE
is still in experiment, we would like to make sure it's not easy to
enable but easy to disable. This patch keeps ANGLE toggle UI enabled
when ANGLE is enabled so that users can easily disable. Once ANGLE is
disabled, if the debug property is not set to true, the toggle UI will
remain disabled.

Bug: b/293503000
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Test: atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: I2e63431cd0d8cf4712fc278646627fbf34a2b542
Merged-In: I2e63431cd0d8cf4712fc278646627fbf34a2b542
 2023-10-17 21:07:48 +00:00
Peiyong Lin
3182b0e298 [Cherry-pick] Add debug property to safe guard ANGLE developer option UI. 
Add a debug property to guard ANGLE developer option UI, only when the
debug property is enabled will ANGLE developer option UI be enabled.

Add further clarification in the text to indicate that this is an
experimental feature.

Bug: b/287909344
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: Ife31f4b0426f3ce107f86cfbaf3f1aeca567e250
Merged-In: Ife31f4b0426f3ce107f86cfbaf3f1aeca567e250
 2023-10-17 21:06:05 +00:00