Vania Januar
6857cb3213
Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev am: e78b1f377e
am: e686a77ec9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894945
Change-Id: Ia3ead3945813be4aca3e91e83f853fa35138c800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 10:13:59 +00:00
Vania Januar
9c9b8afd26
Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev am: e78b1f377e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894945
Change-Id: I01556c0442565babb72c2f879f109ee8e12ba277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 09:31:49 +00:00
Edgar Wang
fae664c79c
Reducing slice requesting logging
...
Bug: 253684322
Test: rebuild
Change-Id: If0e884875e09bd43b88f6b5f205ad450de488552
2023-05-03 17:04:38 +08:00
Vania Januar
e78b1f377e
Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev
2023-05-03 09:00:56 +00:00
Chaohui Wang
80462c370b
FRP bypass defense in the Settings App for SPA
...
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.
Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.
Fix: 280154358
Test: Unit test
Change-Id: I06e73386711d5ad13c89d033cf0fe3164781c0ef
2023-05-03 10:53:27 +08:00
Eric Biggers
795a02c92a
ShadowLockPatternUtils: remove patternEverChosen methods
...
These methods are being removed from LockPatternUtils because they are
no longer used, so remove them from ShadowLockPatternUtils too.
Bug: 270013005
Change-Id: If196bbef4755c644b3188043ed47e99817bf1856
2023-05-03 00:34:48 +00:00
Becca Hughes
b21df6c5fc
Align settings with new mocks
...
Test: ondevice
Bug: 278919696
Change-Id: I274126bce3616596c4a81dd3385f0844d8bdbf71
2023-05-02 23:50:22 +00:00
Becca Hughes
428811be05
Fork autofill default app selection am: ddf359d0f8
am: 270b54d8a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922
Change-Id: I63239ddc7d287a32afc9b686fe83d1aefef8587b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 23:49:18 +00:00
Becca Hughes
476e6769eb
Fork autofill default app selection am: ddf359d0f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922
Change-Id: I52df2333cec85e89f24940c7a463a5ce57f50655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 22:47:57 +00:00
Becca Hughes
ddf359d0f8
Fork autofill default app selection
...
We are merging the default app selection for autofill
with credman so this forks the existing UI (so we can
flag it off).
Test: ondevice
Bug: 278919696
Change-Id: I96bcf1ff86b169a182b9974f7384c45b474c3d5d
2023-05-02 20:31:14 +00:00
Treehugger Robot
1a2d75bb4c
Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732
am: a6c44f048b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943
Change-Id: I8d1ecffc1b8890233ab44a349d2e9ea684e10eed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 15:16:31 +00:00
Treehugger Robot
dc5e91cec8
Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943
Change-Id: If4ea67c5c9ac76a576fa94fd6b9673082039ca1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 15:15:41 +00:00
Treehugger Robot
d624141732
Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev
2023-05-02 14:47:48 +00:00
Treehugger Robot
1ff9d7cc34
Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3
am: f6ba37e583
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142
Change-Id: Ifbc2f697f1c01683bab16227d5a02e9c3044575b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 14:24:35 +00:00
tom hsu
21860761e8
[Settings] Remove WFC enabled state condition of querying Telecomm.
...
- Query WFC enabled state by querying Telecomm may have problem.
- Only use ImsMmTelManager API to check WFC enabled state.
Bug: 278108377
Test: atest passed
Change-Id: I6d1122bcf66ed5cd274e99b7b4f13558ab922162
2023-05-02 12:57:35 +00:00
Ankita Vyas
b32d02c293
Add tests for config check in ClonedAppsPreferenceController
...
Bug: 280071827
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=ClonedAppsPreferenceControllerTest
Change-Id: Id7c2e73bdb0c2af3e700b3620bde2fe77c47f3e6
2023-05-02 12:03:42 +00:00
tom hsu
fa0bdabc6a
[Settings] Fix NPE from updating subinfo changed.
...
- Refactor code to avoid NPE.
Bug: 278721219
Test: make passed
Test: atest MobileDataPreferenceControllerTest passed
Change-Id: I1fe57b8835677335ae9102cfff71451060ea4f78
2023-05-02 11:40:12 +00:00
Treehugger Robot
648266e8d7
Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142
Change-Id: I26d8b679b5783c6b86128ec9ac91a54592854f48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 10:19:39 +00:00
Vania Januar
a1af049378
Guard against null input device in StylusDeviceUpdater
...
Bug: 279170207
Test: StylusDeviceUpdaterTest
Change-Id: Ib4a3f12eaceb87370c800a9dc7eda819c706cd3b
2023-05-02 09:36:43 +00:00
Hiroki Sato
e44848cdce
Don't show bubble settings when framework doesn't support it
...
Some devices don't support bubbles by configuring config_supportsBubble
value. When the value is set false, it doesn't make sense to show bubble
related preferences.
This CL disables showing bubble preferences when device doesn't support
it.
Bug: 274711609
Test: Set config_supportsBubble false, and check UI.
Test: m -j80 RunSettingsRoboTests ROBOTEST_FILTER="Bubble"
Change-Id: I670ad2a9e243819ea014e5e1ddb9d62ad76d2168
2023-05-02 15:46:27 +09:00
Treehugger Robot
3b60e2a9c3
Merge "Fix battery percentage is inconsistent in settings" into udc-dev
2023-05-02 05:08:39 +00:00
ykhung
0288b6d4af
Fix battery percentage is inconsistent in settings
...
Fix: 275217364
Test: make test RunSettingsRoboTests
Change-Id: I16dd772aacaea3f8ddb6da579adb033124e3dbb7
2023-05-02 11:58:08 +08:00
Edgar Wang
8870b51b59
Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am: 55d7c97022
am: 164ddcf0b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931168
Change-Id: I6c818afa043cbe9a8487ee06e0f6f3706e229f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 03:16:50 +00:00
Edgar Wang
08081471da
Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc926
am: 89e460ef92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930678
Change-Id: If351ece8c7b9eeba4d0384c6f2c8b5567f9df4a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 03:15:05 +00:00
Treehugger Robot
6ddc836713
Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e
am: 3bef26666f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539
Change-Id: Id0f3d8dcf8c127f2209f3567d10149fa37556290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 03:14:05 +00:00
Edgar Wang
2d11be89ac
Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am: 55d7c97022
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931168
Change-Id: If6fcde2c5608f8a6b5df847c1bbc3ee5ed9bde9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 02:33:22 +00:00
Edgar Wang
6f58822892
Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc926
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930678
Change-Id: Ia6de8439e8162055b14c595aeeb578badeaad701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 02:33:10 +00:00
Treehugger Robot
bece4e54d2
Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539
Change-Id: I75dad8aadc2147cf0201a89160915a63cc600dea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 02:32:00 +00:00
Edgar Wang
55d7c97022
Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev
2023-05-02 02:31:02 +00:00
Edgar Wang
10129dc926
Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev
2023-05-02 02:30:24 +00:00
Treehugger Robot
65efc1f45e
Merge "Support incompatible charger state in the Settings main page" into udc-dev
2023-05-02 01:51:10 +00:00
Kweku Adams
a8498b14f9
Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1
am: bdf3cb8df9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598
Change-Id: I1cbd994f1906de6e5e6eea57bb7adb89f0a925f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-01 16:57:21 +00:00
Kweku Adams
97252eed2d
Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598
Change-Id: I89c3e6121bbb4083d1f6c49ce4819bf495ce1ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-01 16:14:31 +00:00
ykhung
09c1a4a850
Support incompatible charger state in the Settings main page
...
https://screenshot.googleplex.com/9af4YCnCCjKHCFY
Bug: 271775549
Test: make test RunSettingsRoboTests
Change-Id: I6562e1b48a85ceceb20389ed87e55e0093040be2
2023-05-02 00:04:01 +08:00
Kweku Adams
83c04b32d1
Merge "Use string notifications_disabled instead of off" into udc-dev
2023-05-01 15:37:22 +00:00
ykhung
1d1acc5457
Fix legacy failed tests to avoid block presubmit am: a0f3f421dd
am: b01092ed78
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657
Change-Id: If13eb3979f4fbc14cbfcf0736530f8f14b74876a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-30 08:59:04 +00:00
ykhung
3684f9770e
Fix legacy failed tests to avoid block presubmit am: a0f3f421dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657
Change-Id: I217958f3629dd99d09b6d1a9796ceebada84dce2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-30 08:13:57 +00:00
ykhung
a0f3f421dd
Fix legacy failed tests to avoid block presubmit
...
Root cause: the `Robolectric.setupActivity(Activity.class)` is removed from the system, which will always return the null `Context`
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: Ib52bc715508332bcb4bdcac56ecc414aa43f1419
2023-04-30 00:33:57 +00:00
Chaohui Wang
ca615997ea
Use string notifications_disabled instead of off
...
notifications_disabled was changed to off in
Change: I5f84d09f223efd478461ded93aeac82bf7b128d8
And reverted from off to notifications_disabled in
Change: Iaad301c5513478fb95e40987ea3ccb4f923d71fa
This usage is branched from AppNotificationPreferenceController.java,
and missed in revert.
Bug: 272603842
Test: Visual
Test: Unit test
Change-Id: I5b8466134c1342e10de7a2ead8c52931e0c19377
2023-04-29 15:42:09 +08:00
Treehugger Robot
fa4f628318
Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737
am: 7dfd217c1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821
Change-Id: I3b39848e791168df59d4f2203f59ae14728069df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-29 04:36:52 +00:00
Treehugger Robot
4671972bea
Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821
Change-Id: Ica664646426196d5a88072594eb1a6d04b37ed97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-29 03:52:58 +00:00
Treehugger Robot
24666c9737
Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev
2023-04-29 03:21:56 +00:00
Treehugger Robot
957d03316a
Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27
am: d686c68c69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419
Change-Id: I7f01b4d5757170653680bcb03ce39c323260e3a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-29 00:03:25 +00:00
Treehugger Robot
9a09103aaa
Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419
Change-Id: I57eb532cd21eb2e28b0d58deae5c9adaef597bcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 23:22:14 +00:00
Treehugger Robot
01c585ed27
Merge "Fixes broken Settings test." into udc-dev
2023-04-28 22:37:57 +00:00
Becca Hughes
7fdbfc7b0e
Revert "Rollback decision to merge by package name"
...
This reverts commit ca542c90cd
.
Reason for revert: product changed mind
Change-Id: Ic4b9275e8f19bf2b3e3e51f09162fb6d45e6a5bf
2023-04-28 21:06:00 +00:00
Austin Delgado
4d53fc2add
Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63
am: 01570d3bfc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172
Change-Id: I3130c2ec0a3aa653a11fd211ab4d7a3c411e7fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 19:15:41 +00:00
TreeHugger Robot
59074a8194
Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244
am: b73a414dc4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697
Change-Id: If7b615285655c95a49cad3e06d4f0d23d2dd2179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 19:11:23 +00:00
Yuxin Hu
25b270c0f8
Add developer option switch to set ANGLE as the default system driver
...
This change adds a new developer option switch called
"Enable ANGLE". It defaults to off. User can choose
to toggle it on and off, and the value of the system
property "persist.graphics.egl" is changed accordingly:
switch off: persist.graphics.egl=""
switch on: persist.graphics.egl="angle"
When user toggles the switch, a reboot window is
popped up asking user to reboot now to make the change
takes effect. If user chooses to cancel the reboot,
the switch is toggled back. This enforces that a reboot
is required whenever the "persis.graphics.egl" value
changes.
Upon reboot, we will load either ANGLE or native
GLES driver as the system driver, based on the value of
"persist.graphics.egl".
The switch is disabled if ANGLE is not installed
in /vendor partition. We use the system property
"ro.gfx.angle.supported" as an indicator. We set the
two conditions together in angle.mk file. Any device
mk file that inherits angle.mk file will result in
ANGLE libs installed in /vendor and "ro.gfx.angle.supported"
set to true.
Bug: b/270994705
Test: m; flash and check Pixel 7 boots fine
atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: I565eff614472bb6ba50742e7dfa49b50dca2809f
2023-04-28 18:42:10 +00:00
Austin Delgado
ff7ae4123b
Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172
Change-Id: Ib0a993f8869f22535148be59767deb209acbdf5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 18:36:50 +00:00