Commit Graph

49847 Commits

Author SHA1 Message Date
Matías Hernández
7e6819735f Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea am: dcbe38baa9 am: 0bb6ddf0b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: If67948d9e0c95b74dd05a77a13f31822ce358f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 17:23:53 +00:00
Matías Hernández
dcbe38baa9 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I69d2ef43afb54ce3b9d141d4f676b688dd1c5c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 15:52:58 +00:00
Matías Hernández
2b1faa0aea Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I715da9406bd9d3fe88ff7b5353db1780109880e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 15:09:53 +00:00
Matías Hernández
0aa241be99 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I8cd7cc9605b3728f9f96c3479d17aa1b362d9cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 14:22:10 +00:00
Matías Hernández
a49e14f8ff Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I840d7836ae899bcd40eafc772b96c9460c3f8a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 13:42:07 +00:00
Matías Hernández
50df60c93c Don't hide approved NLSes in Settings am: ff255c6eda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I42099e38ef7b479b9339b545fe8d12d3bbe95112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 12:57:15 +00:00
Milton Wu
7a71b59ca3 [BiometricsV2] Refactor dialogs/helper to kotlin
1. Refactor Dialogs/GlifLayoutHelper to kotlin
2. Add bindView() for Dialogs

Bug: 286197243
Bug: 286197247
Test: atest FingerprintEnrollmentTest
Test: atest biometrics-enrollment-test
Test: Manully show these dialogs
Change-Id: If047f48f8380f03ad8ab3ba55c98c3e745be1eea
2023-06-14 18:53:16 +08:00
Treehugger Robot
12deec820f Merge "[BiometricsV2] Refactor model code to kotlin" 2023-06-14 06:39:01 +00:00
Treehugger Robot
48ed243614 Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc am: f47dbe3bae am: 2179e44ebe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143

Change-Id: I47739ae6931f396fb8ad2986647905088b29b911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 05:54:45 +00:00
Treehugger Robot
2179e44ebe Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc am: f47dbe3bae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143

Change-Id: I37b5082e932c4141dcb3b277c84b096d93ffb3db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:51:15 +00:00
Treehugger Robot
7cfb668c56 Merge "[BiometricsV2] Fix fingerprintSettings not shown" 2023-06-14 04:39:57 +00:00
Treehugger Robot
f47dbe3bae Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143

Change-Id: I2b65e858794346e3231bb7fdb0a013a2d4934677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:24:10 +00:00
Treehugger Robot
57522f0fcc Merge "Shutdown secondary SAP automatically" into udc-d1-dev 2023-06-14 03:35:18 +00:00
Zaiyue Xue
8c25fe4c60 Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev 2023-06-14 03:01:25 +00:00
Weng Su
20fd4a46c8 Shutdown secondary SAP automatically
- If the "Extend compatibility" preference is not supported, then set to shutdown secondary SAP automatically within the "Turn off hotspot automatically" preference.

Bug: 285914977
Test: manual test
atest -c WifiTetherAutoOffPreferenceControllerTest

Change-Id: I405107a4782a6f023442d196d0fca27515aab00e
2023-06-14 05:51:43 +08:00
Grace Cheng
93e7803911 Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c am: f0614ef722 am: 2d5f43d7e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672674

Change-Id: I49c7ff8a9a2191ac8d001c89a41aa0d09a93bbf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 21:21:40 +00:00
Wenhui Yang
e839945290 Merge "Fix face model delete message" into udc-d1-dev am: d56f96aaba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23677227

Change-Id: I147cb8b08941e5b56836c2d95456b605a2ed55f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 21:11:21 +00:00
Wenhui Yang
d56f96aaba Merge "Fix face model delete message" into udc-d1-dev 2023-06-13 20:43:42 +00:00
Grace Cheng
2d5f43d7e3 Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c am: f0614ef722
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672674

Change-Id: Icb68998721d53d5adbbbfe361b22361037e101e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 20:31:17 +00:00
Grace Cheng
f0614ef722 Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672674

Change-Id: I6332c141e3bb13b49bbabfcfebc3e91b8a5faf8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 20:01:00 +00:00
Wenhui Yang
08d11518a8 Fix face model delete message
Add new strings for face model deletion when fingerprint unlock is available.

Test: Manual - test on devices and observe the error message is correct.
Fixes: 283122570
Change-Id: I0511e58d030b8b63391d8406bfc0447fe33fa9fc
(cherry picked from commit 5e71aee4cd)
2023-06-13 18:37:26 +00:00
Grace Cheng
2365ad895a Fix NPE in updateAddPreference
Update mAddFingerprintPreference to avoid NPE

Fixes: 286495189
Test: Rotate screen during first fingerprint enrollment, complete enrollment, and observe no crash
Change-Id: Id7edde492168b467360c6c99b326721cd883bba8
2023-06-13 16:52:51 +00:00
Milton Wu
aadecbaf34 [BiometricsV2] Refactor model code to kotlin
Bug: 286196884
Test: atest FingerprintEnrollmentActivityTest CredentialModelTest
      EnrollmentRequestTest FingerprintEnrollIntroViewModelTest
      FingerprintEnrollmentViewModelTest
Test: atest biometrics-enrollment-test
Change-Id: I2bdae4d2dd052d3664a790cd982edf51fcebec09
2023-06-13 10:29:16 +00:00
Milton Wu
78e0f9de8a [BiometricsV2] Fix fingerprintSettings not shown
Fix "Fingerprint Unlock" page not show when 1st fingerprint is added
through biometrics v2 enrollment on a device w/ faceunlock

Do no check bundle is null or not during check activity result because
it may be null if callee activity doesn't need to pass anything back to
previous caller activity.

Bug: 286993437
Test: test this scenario on a fingerprint only device w/o v2
Test: test this scenario on a faceunlock device w/o v2
Test: test this scenario on a fingerprint only device w/ v2
Test: test this scenario on a faceunlock device w/ v2
Change-Id: Ic6168e73de378ecc1555808d4f0969f4c490a38d
2023-06-13 17:55:49 +08:00
Tetiana Meronyk
eaf7b260e0 Merge "Remove unused parameter from createDialog method in User Info edit dialog" into udc-qpr-dev am: 38b627b69c am: 3ada1f3da8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23475256

Change-Id: Ieed3ae425ace8b2663829089c7517763e45bdc78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 09:44:10 +00:00
tom hsu
34f3320955 [Settings] Fix MMS message UI is no consistency between UI and real state. am: 5216eeaaec am: e21d27c5ef am: d09cfbeb05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23655882

Change-Id: I2a27d2a8f9ff3e7736aaa24bca095a9c86da0b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 09:43:52 +00:00
Tetiana Meronyk
3ada1f3da8 Merge "Remove unused parameter from createDialog method in User Info edit dialog" into udc-qpr-dev am: 38b627b69c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23475256

Change-Id: I1be256ff509008bbd0270a7758c14dd1d8413723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 09:42:07 +00:00
Tetiana Meronyk
38b627b69c Merge "Remove unused parameter from createDialog method in User Info edit dialog" into udc-qpr-dev 2023-06-13 09:36:23 +00:00
tom hsu
d09cfbeb05 [Settings] Fix MMS message UI is no consistency between UI and real state. am: 5216eeaaec am: e21d27c5ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23655882

Change-Id: I9ad25617fc2d6142c8455be78ac8118799ab505f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 09:36:12 +00:00
tom hsu
5c5a39adbe [Settings] Fix MMS message UI is no consistency between UI and real state. am: 5216eeaaec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23655882

Change-Id: Id741c5c75d5982da0ceae3ceef767858e2bcf462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 08:58:46 +00:00
tom hsu
e21d27c5ef [Settings] Fix MMS message UI is no consistency between UI and real state. am: 5216eeaaec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23655882

Change-Id: I61dc41ada82f1fbcba4c1b337681ebd3e4b47055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 08:54:36 +00:00
tom hsu
5216eeaaec [Settings] Fix MMS message UI is no consistency between UI and real state.
Bug: 285253872
Bug: 281566495
Test: Manual test passed.
Change-Id: I805490fd5c4417e88c38a047f99ef626c16f600a
2023-06-13 06:01:25 +00:00
Rhed Jao
1c7c01adb8 Merge "Passing the writing repair mode password flag to verify credential api" into udc-qpr-dev am: cc1fe61339 am: 6856e809b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308384

Change-Id: I4e688e2034b1d33b141fb13a5383b7142b743901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 03:00:36 +00:00
Wenhui Yang
52d5bdc0c1 Merge "Fix fingerprint unlock stuck after renaming" into udc-qpr-dev am: bfa2feb316 am: 9ed0cee15f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23574345

Change-Id: Ib9580f0420fc4bd0de6b06234294af5c2feb8e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 02:59:29 +00:00
Wenhui Yang
4e059e6f4b Merge "Fix face re-enroll stuck for work profile" into udc-qpr-dev am: 14b115177c am: afa7bcb2e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23591204

Change-Id: I953acbc10670453878669fc3912c98bba4850470
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 02:57:50 +00:00
Rhed Jao
6856e809b0 Merge "Passing the writing repair mode password flag to verify credential api" into udc-qpr-dev am: cc1fe61339
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308384

Change-Id: I8042bcbec114798b9fee18b76733944f99bd8c24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 02:55:54 +00:00
Rhed Jao
cc1fe61339 Merge "Passing the writing repair mode password flag to verify credential api" into udc-qpr-dev 2023-06-13 02:14:22 +00:00
Wenhui Yang
9ed0cee15f Merge "Fix fingerprint unlock stuck after renaming" into udc-qpr-dev am: bfa2feb316
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23574345

Change-Id: I1d258a5f739e9ed033bce431e6ea636f3772910a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 01:49:53 +00:00
Wenhui Yang
afa7bcb2e5 Merge "Fix face re-enroll stuck for work profile" into udc-qpr-dev am: 14b115177c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23591204

Change-Id: I6b745a87a4a20ca01bb55cc0a5e921c12f1fcc23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 01:48:41 +00:00
Wenhui Yang
bfa2feb316 Merge "Fix fingerprint unlock stuck after renaming" into udc-qpr-dev 2023-06-13 01:02:42 +00:00
Wenhui Yang
14b115177c Merge "Fix face re-enroll stuck for work profile" into udc-qpr-dev 2023-06-13 01:02:08 +00:00
Taran Singh
5552c412c8 DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352 am: 4a5e1a4d3f am: 6484a7f640
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: I8d65342899d69e875b725a638317162f5f38c9a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 22:01:00 +00:00
Taran Singh
7e1d083e05 DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352 am: 4a5e1a4d3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: I6c689260a1ce82baee992262c0ea32512d758c37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 21:14:57 +00:00
Taran Singh
6484a7f640 DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352 am: 4a5e1a4d3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: I444194ab1c57d376de954f3cbed4ba3d3b0cb3d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 21:12:56 +00:00
Taran Singh
4a5e1a4d3f DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: Idaf9439f1efd96653858177bdea474ad4b85190f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 20:29:16 +00:00
Wenhui Yang
7e6443e025 Fix face re-enroll stuck for work profile
Call super.onCreate(savedInstanceState) first to pass the correct userId
in maxFacesEnrolled.

Test: Manual - delete face unlock for work and re-enroll and observe
face unlock can be enrolled successfully
Test: atest FaceEnrollIntroductionTest

Fixes: 284819031
Change-Id: Ic1620c0ca3ca9adc61f5281abd34471f0c1b3f97
2023-06-12 20:06:01 +00:00
Treehugger Robot
decc428857 Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev 2023-06-12 19:57:26 +00:00
Han Xu
fc05f6766e Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f am: 24fc0d6744
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: Idb39c3d58e9e90f03ec329ab72b772ab705ef7de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:53:23 +00:00
Han Xu
e319c686e7 Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I29b80b692bc97132b5cc7eac3d3a153d0f93d238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:08:24 +00:00
Han Xu
24fc0d6744 Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: Ia99e7b22230a44bbe5c70bcac17b64cd5536e4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:06:18 +00:00