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
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
a23320eedd
Merge "Fix the burst callback issue on the repository" into main
2023-11-07 09:11:06 +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
85ca373e75
Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main
2023-11-07 04:08:35 +00:00
Evan Chen
1ffcf416b5
Make sure work profile app cant enable notification listener services am: 3465535747
am: 3cd41d5c6f
am: 0947ff6b98
am: 91233dd150
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: Id1c2a4497a32af69f648d9dba7c97fb0c680166a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 21:26:25 +00:00
Evan Chen
e08372af9e
Make sure work profile app cant enable notification listener services am: 3465535747
am: d1eadc08dc
am: 9b0c7298cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: Ic95166f026df396b3f9ddb342ece9ec1b0f0876e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 21:26:15 +00:00
Evan Chen
91233dd150
Make sure work profile app cant enable notification listener services am: 3465535747
am: 3cd41d5c6f
am: 0947ff6b98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I87d7e43b1559424220566fee510023b9fe0831a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 21:24:13 +00:00
Evan Chen
9b0c7298cc
Make sure work profile app cant enable notification listener services am: 3465535747
am: d1eadc08dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I529ed6c2ed248a52e295ae751cf42be4c5fe199f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 20:58:04 +00:00
Evan Chen
0947ff6b98
Make sure work profile app cant enable notification listener services am: 3465535747
am: 3cd41d5c6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I7d6125bf4eeceb3fb3cad1f495e677694dd9b175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 20:53:53 +00:00
Evan Chen
4a33b437d4
Make sure work profile app cant enable notification listener services am: 5c6ca7959c
am: dab54b5734
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551
Change-Id: I9a32e9f02c5d14d07085154f2e9d7e1a7fe681b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 20:14:24 +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
3cd41d5c6f
Make sure work profile app cant enable notification listener services am: 3465535747
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I492643968e65f1c7e7881379914a59bc535e4047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 20:12:03 +00:00
Evan Chen
d1eadc08dc
Make sure work profile app cant enable notification listener services am: 3465535747
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: Iab3c4ee5e7ae6a685f3a5f22308f694a28da5fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 20:11:51 +00:00
Evan Chen
dab54b5734
Make sure work profile app cant enable notification listener services am: 5c6ca7959c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551
Change-Id: Ica7d3101c8f1efbc798654d0492fa87dcfee28fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 20:11:40 +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
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
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
e8df63f148
Merge "settings(nfc): Remove NFC beam settings" into main
2023-10-30 20:26:18 +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
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
5abd3420c4
Merge "Add a config to show the Vpn options menu." into main
2023-10-23 05:53:32 +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
f1cbe74e08
Merge "Only allow clearing of Euicc Data by owner or demo user" into main
2023-10-20 08:33:27 +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
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
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
Peiyong Lin
24503938b9
[Cherry-pick] Add warning on enabling ANGLE. am: d3c75bd9eb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2794036
Change-Id: I83052d9a208fe4b2d8e4bcbaea07cfead1f8bec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-18 20:39:19 +00:00
Treehugger Robot
0481d6a318
Merge changes from topic "angle-developer-option-toggle1" into main
...
* changes:
[Cherry-pick] Allow ANGLE developer option toggle UI enabled if ANGLE is enabled.
[Cherry-pick] Add debug property to safe guard ANGLE developer option UI.
[Cherry-pick] Add warning on enabling ANGLE.
2023-10-18 19:50:40 +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
Peiyong Lin
d3c75bd9eb
[Cherry-pick] Add warning on enabling ANGLE.
...
Enabling ANGLE on incompatible devices may cause some applications to
crash, add a warning.
Bug: b/287909344
Test: atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: I4f856ee1912a59052a6aaf7dff087ce1b649935e
Merged-In: I4f856ee1912a59052a6aaf7dff087ce1b649935e
2023-10-17 21:02:47 +00:00
Treehugger Robot
99a382a05f
Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main am: 3eea9e53a1
am: 72943317d2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2767862
Change-Id: I5f5f1c389edb778a44aad736081ff077dcd402aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-16 03:08:55 +00:00
Treehugger Robot
72943317d2
Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main am: 3eea9e53a1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2767862
Change-Id: Id9c81a0d31b4a0452d614b68b6850342a94ab3aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-16 02:37:41 +00:00
Treehugger Robot
3eea9e53a1
Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main
2023-10-16 01:52:44 +00:00
Treehugger Robot
409a6b2492
Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d
am: b06310a63f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829
Change-Id: Id95f85e07c45a722a5229507be58cb582ca3587e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-12 01:11:05 +00:00
Treehugger Robot
b06310a63f
Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f98d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829
Change-Id: Id02586892e1b22d8450098323183c1ad33ca8574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-12 00:38:18 +00:00
Treehugger Robot
4b0bf8f98d
Merge "Clean up obsolete aliases for Truth." into main
2023-10-11 23:59:17 +00:00
Krzysztof Kosiński
665b151f87
Clean up obsolete aliases for Truth.
...
Bug: 255714762
Test: presubmit
Change-Id: I8aab463c74d5e869d949a2b712886a9cc4d15709
Merged-In: I8aab463c74d5e869d949a2b712886a9cc4d15709
2023-10-11 23:10:01 +00:00
Eric Biggers
c44a165ec7
Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378bd
am: 12c1013250
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776713
Change-Id: I3c6492ee12dc88b518079e167583b37435743d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 21:18:01 +00:00
Eric Biggers
12c1013250
Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378bd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776713
Change-Id: Ib504b453a8caac0789084affcaa70a33e8b554d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 20:11:52 +00:00
Eric Biggers
b862d378bd
Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main
2023-10-10 19:43:59 +00:00
Evan Chen
5c6ca7959c
Make sure work profile app cant enable notification listener services
...
Fix: 282934003
Test: Run test app in work profile
Change-Id: I7fed6d1baa1a40e9126493d37e33d63236bb4b3c
Merged-In: 81893c2b6f
(cherry picked from commit 81893c2b6f
)
2023-10-10 17:22:07 +00:00
Evan Chen
3465535747
Make sure work profile app cant enable notification listener services
...
Fix: 282934003
Test: Run test app in work profile
Change-Id: I7fed6d1baa1a40e9126493d37e33d63236bb4b3c
Merged-In: 81893c2b6f
(cherry picked from commit 81893c2b6f
)
2023-10-10 17:21:44 +00:00
Evan Chen
aa122da7d6
Make sure work profile app cant enable notification listener services
...
Fix: 282934003
Test: Run test app in work profile
Change-Id: I7fed6d1baa1a40e9126493d37e33d63236bb4b3c
Merged-In: 81893c2b6f
(cherry picked from commit 81893c2b6f
)
2023-10-10 16:59:33 +00:00
Cassie Wang
760712201e
Add a config to show the Vpn options menu.
...
Bug: 290124499
Test: m -j32 Settings
Change-Id: I14d59b656e917f6fb7a495f14297c594a115c018
2023-10-10 13:07:00 +09:00