Commit Graph

125771 Commits

Author SHA1 Message Date
Wenhui Yang
4e4941480f Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471

Change-Id: I0a7131567f578e045d20bc92fa50b1e4fb3f85cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 06:28:24 +00:00
Wenhui Yang
22dd107a8a Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471

Change-Id: I2ed86a2abfb152f80b53640e1efd6b3b570d6166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 06:28:19 +00:00
Charles Chen
fd34dac5ea Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361 am: 2258dd83cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038

Change-Id: I9380b30d997f7e313d86af542631a4e22f0cb104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 06:27:08 +00:00
Charles Chen
5e2678fe10 Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361 am: fd10333243
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038

Change-Id: I232ab947263df6788fd47d70bdd57cd0966fc44f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 06:26:02 +00:00
Wenhui Yang
2755f17587 Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471

Change-Id: I9c48161c5f1a85251daee07af18f8d1f128c468c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 06:24:02 +00:00
Wenhui Yang
25de3b2b9c Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev 2023-05-03 06:11:23 +00:00
Charles Chen
f8d75358ea Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038

Change-Id: If45c374a6db9f383dad8f0e169f083e6acef9a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 05:48:59 +00:00
Charles Chen
2258dd83cd Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038

Change-Id: I38c795e9729694e7720387dde7e8c2d5ece5e3ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 05:48:14 +00:00
Charles Chen
fd10333243 Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038

Change-Id: I03eb3a4db5d220ec48a00a19490794732f574658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 05:47:52 +00:00
Charles Chen
cb5a240361 Merge "Disable Settings large-screen optimization" into udc-dev 2023-05-03 05:44:08 +00:00
Edgar Wang
b663f17d31 Add new page enum for Account detail
Bug: 260054568
Test: rebuild
Change-Id: I332bebf4f4ce725759860f937f50c8a6f21d8648
2023-05-03 13:06:28 +08:00
SongFerngWang
0d36d37590 Shows main_battery information for not untethered device
The metadata have main_battery and device is not untethered device,
then UI show battery by metadata.

Bug: 273907230
Test: atest AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: I73d8a69c81fe234a5c576ca3769c1b079ac0ceb4
2023-05-03 04:23:50 +00:00
Chaohui Wang
2aca9d40f8 Use correct App info screen's trash can icon
Fix: 280120259
Test: Visual
Change-Id: I954c344c3f5fdd256de7519f1534c982c084a521
2023-05-03 11:59:43 +08: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
Xiaozhen Lin
bb54d71a33 Password clearing in Settings App
Pixel Imprint will call onDestroy() whenever its menu is invisible.
(https://cs.android.com/android/platform/superproject/+/master:packages/apps/Settings/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java;l=639?q=packages%2Fapps%2FSettings%2Fsrc%2Fcom%2Fandroid%2Fsettings%2Fbiometrics%2Ffingerprint%2FFingerprintSettings.java&ss=android)
However, Screen lock should have the same behavior as Pixel Imprint but
it doesn't.
onDestroy() for Screen lock should be called whenever we exit the menu
or the menu becomes invisible. Otherwise, the password may be leaked to
RAM unexpectedly in some situations.

Bug: 233373529
Bug: 278488549
Bug: 278530059
Test: manual
Change-Id: Ib11af7073aa1c49096a66c9f5a462e7caf18df5e
2023-05-03 02:04:59 +00:00
Gil Cukierman
97e675533a Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab am: 6b5aa480de am: 38a1a3222c am: 78d8fe7472
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756

Change-Id: Ie2648f82c05d2de4c23dc2ad09ed7957b1a1087d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 01:35:55 +00:00
Gil Cukierman
78d8fe7472 Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab am: 6b5aa480de am: 38a1a3222c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756

Change-Id: Iabc5461e62d7973514bf9ffc15c06f8256517a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 01:17:49 +00:00
Gil Cukierman
9b3784709f Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab am: 6b5aa480de am: 3ef10ba1e0 am: 4526bcb348
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756

Change-Id: I058333ffbf136a055357155c0d24a57e14a5e02d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:56:57 +00:00
Diya Bera
ceef5502dc Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: eb63f480cc am: ba1b53e93e am: 18d92855e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757

Change-Id: Idbcf08de2d76ff7916f83a5f8f9157350570a3e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:56:46 +00:00
Becca Hughes
2262726c5e Fork autofill default app selection am: ddf359d0f8 am: 02e4e1d05f am: 5215358c2c am: 87fc456d05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922

Change-Id: I235de8fb574d0097af0c75329951b9a76159cd62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:56:28 +00:00
Gil Cukierman
178c844b8a Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab am: dd5fef516d am: 68251aefed am: f4755a4649
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756

Change-Id: Ie8fa0cb45d525e40a712bbfabf1adf20bda4f328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:55:16 +00:00
Diya Bera
7bf7e3b0e2 Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: d4066f5f7a am: 4c2a3ab3a0 am: 6198906dd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757

Change-Id: I43cc9924b970c73eeff5361aeef941bfd3cd4ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:55:03 +00:00
Becca Hughes
b3c487edc2 Fork autofill default app selection am: ddf359d0f8 am: 476e6769eb am: 54734fd6b3 am: 6ae92bcf16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922

Change-Id: Ifee2e6605dfae7393da9aad308575a4d5cca8bde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:54:51 +00:00
Diya Bera
3b7da5b26d Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: eb63f480cc am: 2f9df85d1a am: 82b093054e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757

Change-Id: I6ff1e18d64197cacb61bc1370f2eabe43154d709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:54:36 +00:00
Gil Cukierman
4526bcb348 Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab am: 6b5aa480de am: 3ef10ba1e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756

Change-Id: Ieb20df3875eab187a7f3bcacc0a73ab3b432d248
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:54:18 +00:00
Becca Hughes
4a05ef9d80 Fork autofill default app selection am: ddf359d0f8 am: 02e4e1d05f am: b66c783024 am: dbee9f7670
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922

Change-Id: I8b23391f0e0402aac8e2f46f7b874b3ba81e861f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:53:45 +00: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
Gil Cukierman
38a1a3222c Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab am: 6b5aa480de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756

Change-Id: I68cc91998ade8d4986d3852f091655e08cad0ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:32:05 +00:00
Gil Cukierman
3ef10ba1e0 Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab am: 6b5aa480de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756

Change-Id: Ib594b56fc30255732e2f1d1f64e151619919c678
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:30:11 +00:00
Diya Bera
18d92855e8 Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: eb63f480cc am: ba1b53e93e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757

Change-Id: I7ea6e5857876b7b196caa41c83b11ad64a31a2dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:15:01 +00:00
Becca Hughes
87fc456d05 Fork autofill default app selection am: ddf359d0f8 am: 02e4e1d05f am: 5215358c2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922

Change-Id: I6f4ca5374d51bca78e269d27c80f1f8b0bd2694e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:14:43 +00:00
Gil Cukierman
f4755a4649 Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab am: dd5fef516d am: 68251aefed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756

Change-Id: I90f0961312c163e19851d5f6a962edccb9ffa4a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:14:19 +00:00
Diya Bera
6198906dd9 Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: d4066f5f7a am: 4c2a3ab3a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757

Change-Id: I8b8e7b8ed1299ea00b577fcffd78ddbd9d6676be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:14:01 +00:00
Becca Hughes
6ae92bcf16 Fork autofill default app selection am: ddf359d0f8 am: 476e6769eb am: 54734fd6b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922

Change-Id: If8376ee32e87d3abd920223731c72eda9634613d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:13:34 +00:00
Diya Bera
82b093054e Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: eb63f480cc am: 2f9df85d1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757

Change-Id: Ib10ed5f2b4e08bf6e09d4cdc94778f5ff857988f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:12:44 +00:00
Gil Cukierman
68251aefed Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab am: dd5fef516d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756

Change-Id: Ib5f3072d43710611efad4bbf69cb3566911c50e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:11:22 +00:00
Becca Hughes
dbee9f7670 Fork autofill default app selection am: ddf359d0f8 am: 02e4e1d05f am: b66c783024
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922

Change-Id: Iffbc0657ff72e99eaf4d4b09f083e1acb7326e65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:11:21 +00:00
Gil Cukierman
7aad62fb41 Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab am: 13b49a9da0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756

Change-Id: If518d5b21481fc9ee353465e2db9047a332dcc2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 23:53:10 +00:00
Gil Cukierman
dd5fef516d Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756

Change-Id: I4d39e88aca6e31c3e897a0d16ec45124906d63cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 23:51:30 +00:00
Gil Cukierman
13b49a9da0 Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756

Change-Id: I7bbe8f3aa976d7c1f1d1c387c0c01d7a551127bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 23:50:56 +00:00
Diya Bera
4c2a3ab3a0 Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: d4066f5f7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757

Change-Id: Id052be1ff606206053901911b6d62b13460f5c42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 23:50:31 +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
Gil Cukierman
6b5aa480de Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756

Change-Id: I7a4655c5ac9ef9e7d66486591e1cfe566f385a47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 23:50:13 +00:00
Becca Hughes
54734fd6b3 Fork autofill default app selection am: ddf359d0f8 am: 476e6769eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922

Change-Id: Ia05a440e7c334020a829c355a32d3a250e2417ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 23:50:13 +00:00
Diya Bera
471fa2f0df Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: 47ccf9d776
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757

Change-Id: Ic8caf36e5e2e0124fc8658c2b9a92e0c2a874c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 23:50:08 +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
Eric Biggers
d2b1d43a7d Merge "ChooseLockPattern: remove redundant setting of visible pattern default" 2023-05-02 23:41:38 +00:00
Diya Bera
ba1b53e93e Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: eb63f480cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757

Change-Id: Icd7ae4ce31f59c7a0e3d47d368d9904c743384eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 23:32:08 +00:00
Becca Hughes
5215358c2c Fork autofill default app selection am: ddf359d0f8 am: 02e4e1d05f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922

Change-Id: Iffea8157079911c9a26de9cf8f03c3cea3f6d3fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 23:31:48 +00:00
Diya Bera
2f9df85d1a Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: eb63f480cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757

Change-Id: I347b01c9dd6ef0fe73b4cd2052060480697266b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 23:28:04 +00:00