Commit Graph

76790 Commits

Author SHA1 Message Date
Josh Hou
abe032ea66 Show/hide 5G preferred network type also consider allowed_network_type
1. The carrier or privileged apps will enable/disable network types on
the device, so Settings references the allowed network type to show/hide
5G preferred network type option.

2. For mainline, copy the getNetworkTypeFromRaf() from RadioFamily to
Settings.

Bug: 136730709
Test: Manual test & EnabledNetworkModePreferenceControllerTest
1. Enable allowed_network_type
2. Disable allowed_network_type
Merged-In: I493f2a2c7f4bc32b3fcb8ab2bace5839d8667bd5

Change-Id: Id591f454a60d0ba08c3fc4a2ffe40836dafeb5f0
2020-08-10 16:18:36 +08:00
Bonian Chen
3dfd917c08 [automerger skipped] Merge "[Settings] Code refactor" am: d1998a6fe8 am: caf6ede5f7 -s ours am: a3e98a699e -s ours am: f774cdf0ee -s ours
am skip reason: Change-Id I256870483d85bf7000556357071834cad24884d1 with SHA-1 1df6c9cdd4 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393366

Change-Id: I139973afc6f78d0fec44eff9e476c1dbaaac65c5
2020-08-10 08:09:46 +00:00
SongFerng Wang
780fb52a24 Merge "Manual selection item's data icon is wrong" into rvc-d1-dev am: ddc238c15e am: cf614aa1ee am: e0315e1a7f am: 79905fd73e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12326249

Change-Id: I79e55bb312ccdb3fe5fcfee146aae39fe05d12fa
2020-08-10 08:03:03 +00:00
SongFerng Wang
de80c4d622 Merge "Manual selection item's data icon is wrong" into rvc-d1-dev am: ddc238c15e am: a19f93e7f6 am: e0fd5aa92a am: b5f1c1b819
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12326249

Change-Id: If40e8eca1c0511b6bcfd8ce5269fc0caf8475b3c
2020-08-10 08:02:52 +00:00
Bonian Chen
f774cdf0ee [automerger skipped] Merge "[Settings] Code refactor" am: d1998a6fe8 am: caf6ede5f7 -s ours am: a3e98a699e -s ours
am skip reason: Change-Id I256870483d85bf7000556357071834cad24884d1 with SHA-1 1df6c9cdd4 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393366

Change-Id: I81d83289d2daf8a13677c0aba58e81cfcb587656
2020-08-10 07:57:03 +00:00
SongFerng Wang
79905fd73e Merge "Manual selection item's data icon is wrong" into rvc-d1-dev am: ddc238c15e am: cf614aa1ee am: e0315e1a7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12326249

Change-Id: I444949c42e2d339bc0fb3772ffec85c4fb34fe55
2020-08-10 07:45:06 +00:00
SongFerng Wang
b5f1c1b819 Merge "Manual selection item's data icon is wrong" into rvc-d1-dev am: ddc238c15e am: a19f93e7f6 am: e0fd5aa92a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12326249

Change-Id: I9b9571f8ff033530f80823aec6b4321ce604272a
2020-08-10 07:44:41 +00:00
Bonian Chen
a3e98a699e [automerger skipped] Merge "[Settings] Code refactor" am: d1998a6fe8 am: caf6ede5f7 -s ours
am skip reason: Change-Id I256870483d85bf7000556357071834cad24884d1 with SHA-1 1df6c9cdd4 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393366

Change-Id: Ia52ca5268d3eaa380df4e5eb90329cd7210aade9
2020-08-10 07:36:17 +00:00
Bonian Chen
7922511e44 [automerger skipped] Merge "Replaced reference to setPreferredNetworkType" am: c1ec7f1fea am: d97cb511ac -s ours am: daa07ea2d6 -s ours am: efb6d09d0f -s ours am: 18a663c92d -s ours am: 638081c98b -s ours
am skip reason: Change-Id I8ae86595b104dcd16daacbf52cc8eaa5e7a3d08b with SHA-1 3555e1707a is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393368

Change-Id: Ice0454e6af174c433909ba99578ee9fe2938cb2a
2020-08-10 07:36:17 +00:00
SongFerng Wang
e0315e1a7f Merge "Manual selection item's data icon is wrong" into rvc-d1-dev am: ddc238c15e am: cf614aa1ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12326249

Change-Id: I3a227938ed47529d18c58afdc98b711a1e49921a
2020-08-10 07:27:08 +00:00
SongFerng Wang
e0fd5aa92a Merge "Manual selection item's data icon is wrong" into rvc-d1-dev am: ddc238c15e am: a19f93e7f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12326249

Change-Id: I0c4a0a515d23a79315908e6a790a590cc2e6cdb3
2020-08-10 07:25:58 +00:00
Bonian Chen
caf6ede5f7 Merge "[Settings] Code refactor" am: d1998a6fe8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393366

Change-Id: Ie2a82c86d1ad63e92bebf69b0f98939a0b33f87e
2020-08-10 07:20:10 +00:00
Bonian Chen
638081c98b [automerger skipped] Merge "Replaced reference to setPreferredNetworkType" am: c1ec7f1fea am: d97cb511ac -s ours am: daa07ea2d6 -s ours am: efb6d09d0f -s ours am: 18a663c92d -s ours
am skip reason: Change-Id I8ae86595b104dcd16daacbf52cc8eaa5e7a3d08b with SHA-1 3555e1707a is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393368

Change-Id: I3ac6bcd527bc8293d189df29be2dd8228b23c03a
2020-08-10 07:18:42 +00:00
SongFerng Wang
cf614aa1ee Merge "Manual selection item's data icon is wrong" into rvc-d1-dev am: ddc238c15e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12326249

Change-Id: Ie601f7835d5cb99dbd1491deaae5ed394a94c549
2020-08-10 07:10:26 +00:00
SongFerng Wang
a19f93e7f6 Merge "Manual selection item's data icon is wrong" into rvc-d1-dev am: ddc238c15e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12326249

Change-Id: I5b0386cc82ff7fc8383cd5eebab929e0d8a6458a
2020-08-10 07:09:03 +00:00
Bonian Chen
d1998a6fe8 Merge "[Settings] Code refactor" 2020-08-10 07:02:46 +00:00
Bonian Chen
18a663c92d [automerger skipped] Merge "Replaced reference to setPreferredNetworkType" am: c1ec7f1fea am: d97cb511ac -s ours am: daa07ea2d6 -s ours am: efb6d09d0f -s ours
am skip reason: Change-Id I8ae86595b104dcd16daacbf52cc8eaa5e7a3d08b with SHA-1 3555e1707a is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393368

Change-Id: Id316d5f7916e7e39719b73ff12bcf9980e720f16
2020-08-10 07:01:31 +00:00
SongFerng Wang
ddc238c15e Merge "Manual selection item's data icon is wrong" into rvc-d1-dev 2020-08-10 06:52:48 +00:00
Bonian Chen
efb6d09d0f [automerger skipped] Merge "Replaced reference to setPreferredNetworkType" am: c1ec7f1fea am: d97cb511ac -s ours am: daa07ea2d6 -s ours
am skip reason: Change-Id I8ae86595b104dcd16daacbf52cc8eaa5e7a3d08b with SHA-1 3555e1707a is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393368

Change-Id: I6292dce2e89cbff4486490af0ae08115478b855a
2020-08-10 06:46:52 +00:00
Bonian Chen
daa07ea2d6 [automerger skipped] Merge "Replaced reference to setPreferredNetworkType" am: c1ec7f1fea am: d97cb511ac -s ours
am skip reason: Change-Id I8ae86595b104dcd16daacbf52cc8eaa5e7a3d08b with SHA-1 3555e1707a is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393368

Change-Id: I4fe7fe78122bfd753f9c407a5e3013c0886d4623
2020-08-10 06:27:20 +00:00
Bonian Chen
d97cb511ac Merge "Replaced reference to setPreferredNetworkType" am: c1ec7f1fea
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393368

Change-Id: I252c98b9f0f17c42cd8b38d724a68d22db3626ca
2020-08-10 06:10:02 +00:00
Bonian Chen
c1ec7f1fea Merge "Replaced reference to setPreferredNetworkType" 2020-08-10 05:51:23 +00:00
PETER LIANG
44f812513d Merge "Fix the screen scrolling down after enabling dark theme." am: 946dafab93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12324933

Change-Id: Ib36b5813e94a51d9bb0c81301819b13af14cb972
2020-08-10 04:11:16 +00:00
PETER LIANG
946dafab93 Merge "Fix the screen scrolling down after enabling dark theme." 2020-08-10 03:56:44 +00:00
Bill Yi
ca593c59ba Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6e85177b1bc1790aa8af1563db011d61249a4056
2020-08-09 09:26:09 -07:00
Bill Yi
4de9e4f5eb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c -s ours am: 88558e8940 -s ours am: c19f0a3aab -s ours am: 502c4207f0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12334452

Change-Id: I2c12a777bc3d8f0af07d6e4e4ba298613b216300
2020-08-08 20:54:41 +00:00
Bill Yi
3820e26133 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c -s ours am: 064ba89fc3 -s ours am: b8a813bb24 -s ours am: be15bdbc8a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12334452

Change-Id: I44b4eb57723e6d505ba574c41e277c1ddf0c376a
2020-08-08 20:54:11 +00:00
Bill Yi
502c4207f0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c -s ours am: 88558e8940 -s ours am: c19f0a3aab -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12334452

Change-Id: I25752bf3e4f3e1b51416ea923cd872049498d9b8
2020-08-08 20:35:52 +00:00
Bill Yi
be15bdbc8a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c -s ours am: 064ba89fc3 -s ours am: b8a813bb24 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12334452

Change-Id: I619861f453915a735a1c2a507e5aa39c084e2250
2020-08-08 20:35:46 +00:00
Bill Yi
59e2be3b6b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e18f9f537 -s ours am: 10e95dc4d8 -s ours am: 294dd34b0e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12339316

Change-Id: Ib4282f99ccc2e768941c77ff2d20a6d2c59635d8
2020-08-08 20:23:55 +00:00
Bill Yi
c19f0a3aab [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c -s ours am: 88558e8940 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12334452

Change-Id: Id678d1fe415daee63ec0c0395c0fb276c48dece6
2020-08-08 20:17:23 +00:00
Bill Yi
b8a813bb24 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c -s ours am: 064ba89fc3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12334452

Change-Id: Ie242c290b510311f48b8804fe3e79874de90e3cf
2020-08-08 20:16:18 +00:00
Bill Yi
294dd34b0e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e18f9f537 -s ours am: 10e95dc4d8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12339316

Change-Id: I0615bafddf68242ff46d99b86b26ec11d9e2cc48
2020-08-08 20:08:16 +00:00
Bill Yi
88558e8940 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12334452

Change-Id: I77c4998fa1886c8768626db6f8c3848160bf00a2
2020-08-08 19:59:01 +00:00
Bill Yi
064ba89fc3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12334452

Change-Id: I8e3eb6c072488fdc33fae1ebabd17980a67f5d7d
2020-08-08 19:57:42 +00:00
Bill Yi
10e95dc4d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e18f9f537 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12339316

Change-Id: I5e6cf5a03b4cef0d9e45ddd55e048376bafc7e16
2020-08-08 19:49:23 +00:00
Bill Yi
23f76ec2e4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b031fca9f3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12339318

Change-Id: I5a7ac6d675ef52f71404be0a6fcf729e8d520819
2020-08-08 19:48:18 +00:00
Bill Yi
b031fca9f3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6151b580d988f38123ccfda9f2d944dca6f90e4f
2020-08-08 17:30:16 +00:00
Bill Yi
7e18f9f537 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I49ca37ad76af4049e36d41140610b131f99bf46e
2020-08-08 16:11:50 +00:00
Bill Yi
80d8d4d07c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9584a9b4b73a955be75ed4957eeb01e88a6c745a
2020-08-08 15:32:24 +00:00
Kevin Chyn
c7388cf7cf Merge changes from topics "async-challenge", "lss-sp" am: c0f4353b9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12276443

Change-Id: I965120b6ee113cd4ade325054068de52326c7663
2020-08-08 00:10:15 +00:00
Kevin Chyn
c67d7f51fc BiometricEnrollIntro should use non-blocking generateChallenge am: 66bfe45f99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12276442

Change-Id: Ib3bc708fb8bce148e2828fb63f47287629f427d6
2020-08-08 00:10:13 +00:00
Kevin Chyn
7465a07b46 4/n: Remove challenge from choose/confirm, use new path am: 7b0867c6d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12213745

Change-Id: I0d6e8c56a744d343773a3d02012aeda01781bade
2020-08-08 00:10:11 +00:00
Kevin Chyn
19ed437a5c 3/n: verifyCredential no longer returns RequestThrottledException am: e67a0afc41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12222935

Change-Id: If8b089662ebcd3a4253287d14c5d652cb2331adf
2020-08-08 00:10:09 +00:00
Kevin Chyn
b6101803df 2/n: Add setRequestGatekeeperPassword to ChooseLockSettingsHelper am: fbc2ec831f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12212655

Change-Id: I4040f37063aa6722dc11c928f68e949d6cc29d5a
2020-08-08 00:10:06 +00:00
Kevin Chyn
c0f4353b9d Merge changes from topics "async-challenge", "lss-sp"
* changes:
  Remove remainder of generateChallengeBlocking
  BiometricEnrollIntro should use non-blocking generateChallenge
  4/n: Remove challenge from choose/confirm, use new path
  3/n: verifyCredential no longer returns RequestThrottledException
  2/n: Add setRequestGatekeeperPassword to ChooseLockSettingsHelper
2020-08-08 00:05:53 +00:00
Jay Aliomer
b569dfdac8 Time for dark theme doesnt format 24 hr correctly
Fixes: 163048376
Test: Manual
Change-Id: Ia6c2633408670656c2b42bfb724aaf900561682e
2020-08-07 23:43:09 +00:00
Kevin Chyn
66bfe45f99 BiometricEnrollIntro should use non-blocking generateChallenge
GenerateChallenge used to block when showing the credential screen.
Now that GenerateChallenge is moved to after the credential screen
is shown, we need to delay the next button instead. This is generally
non percievable to the user, but this is more robust against busy
system server.

Fixes: 161325267
Test: Enroll fingerprint/face device
Change-Id: I0fbbef8bf469e32bed251acf22556ad2ea8e2933
2020-08-07 12:49:37 -07:00
Kevin Chyn
bee84e2daa Remove remainder of generateChallengeBlocking
Test: make -j56 RunSettingsRoboTests

Face Tests:
Test: Open face settings, remove face, add face
Test: Open face settings, but cancel credential confirmation.
      Face settings does not show up
Test: adb shell am start -a android.app.action.SET_NEW_PASSWORD
      Able to enroll face

Fingerprint Tests:
Test: Open fingerprint settings, add button is shown
Test: Open fingerprint settings, but cancel credential confirmation.
      Fingerprint settings does not show up
Test: adb shell am start -a android.app.action.SET_NEW_PASSWORD
      Able to enroll fingerprint

Bug: 162533680
Change-Id: Ie448ed086e73b0b545bd3a2e62437c543f7aad6c
2020-08-07 12:49:37 -07:00
Kevin Chyn
7b0867c6d3 4/n: Remove challenge from choose/confirm, use new path
Biometric enrollment will not request a Gatekeeper HAT during
initial credential setup or credential confirmation anymore.
Instead, it is broken down into the following steps now.

Bug: 161765592

1) Request credential setup / confirmation to return a
   Gatekeeper Password
2) Biometric enrollment will generate a challenge
3) Biometric enrollment will request LockSettingsService to
   verify(GatekeeperPassword, challenge), and upon verification,
   the Gatekeeper HAT will be returned.

Since both LockSettingsService and Biometric enroll/settings
make use of biometric challenges, this allows us to make the
challenge ownership/lifecycle clear (vs. previously, where
LockSettingsService has no idea who the challenge belongs to).

Exempt-From-Owner-Approval:For files not owned by our team,
(StorageWizard), this change is just a method rename

Test: RunSettingsRoboTests

Run the following on face/fingerprint devices
Test: Remove credential
      adb shell am start -a android.app.action.SET_NEW_PASSWORD
      Set up credential + fingerprint
Test: Remove credential,
      adb shell am start -a android.settings.FINGERPRINT_SETTINGS
      This tests the ChooseLock* logic in FingerprintSettings
Test: Set up credential,
      adb shell am start -a android.settings.FINGERPRINT_SETTINGS
      This tests the ConfirmLock* logic in FingerprintSettings
Test: Remove device credential, enroll fingerprint/face. Succeeds.
      This tests the ChooseLock* returning SP path from
      BiometricEnrollIntro
Test: With credential and fingerprint/face enrolled, go to
      fingerprint/face settings and enroll. This tests the
      ConfirmLock* path in Fingerprint/FaceSettings
Test: Remove device credential, enroll credential-only, enroll
      fingerprint/face separately. Succeeds. This tests the
      ConfirmLock* returning SP path in BiometricEnrollIntro
Test: In SUW, set up credential, then biometric. This tests
      the ChooseLock* path in SUW
Test: In SUW, set up credential, go back, then set up biometric.
      This tests the ConfirmLock* path in SUW

Change-Id: Idf6fcb43f7497323d089eb9c37125294e7a7f5dc
2020-08-07 12:49:15 -07:00