Commit Graph

82734 Commits

Author SHA1 Message Date
bsears
c358adad56 Revert "Return enrollment consent status to caller."
This reverts commit eb1dac69f0.

Reason for revert: Based on bisection, this CL is the root cause for bug 192420564, which breaks Setup Wizard.

Bug: 192420564
Change-Id: I8d9aee7fe2415e134fcc981b0548bd9ce300db55
2021-06-30 14:53:13 +00:00
Joe Bolinger
eb1dac69f0 Return enrollment consent status to caller.
Bug: 188847063
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL --ez require_consent true
Change-Id: I3285b379e175539c37355c67749c3d900e6ac62b
2021-06-28 17:51:46 -07:00
Yanting Yang
ca0415d475 Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev 2021-06-28 12:54:44 +00:00
Bonian Chen
a3f28b034d Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev 2021-06-28 10:06:21 +00:00
Bonian Chen
d9bf670725 Revert "[Settings] Code Refactor - ActiveSubscip..."
There seems to be an issue on system when a modification on file name get referenced by multiple submit(s).
(ag/15106410 and ag/15102785).

It seems to me that, build system got build breakage immediately instead of merging all of the files (even within same package).

Reason for revert: Try to submit all of the modifications within single submit as a workaround.

Bug: 192204057
Test: build pass
Change-Id: Ie497088a58c6ac564fde193fad2c0b67a965933c
2021-06-28 09:32:54 +00:00
Hugh Chen
52b13e9795 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 346b049fb1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1b667afef2b3858cb3cb627404090e5de7dba48b
2021-06-28 07:18:39 +00:00
Hugh Chen
b17f196c3d [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: c91f8b0991 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iec0be080d17d234d4ef68d1e29bbe7be18a9e91b
2021-06-28 07:18:34 +00:00
Hugh Chen
5e708fd301 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 1e764fb0a6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I64dbe7b1dddfaac7d0c35378951df62a4688a477
2021-06-28 07:18:13 +00:00
Hugh Chen
ad3ecbdd0c [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: d8ef6bc5af -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaf07be5625a927fdffacbe491140018873a40560
2021-06-28 07:18:08 +00:00
Hugh Chen
1e764fb0a6 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib79eaf776f222a1af892a881d6f9a9b2d6e28471
2021-06-28 07:07:07 +00:00
Hugh Chen
346b049fb1 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c044bc08439ecd3132b3bacd0d47eddd9ccebb0
2021-06-28 07:07:01 +00:00
Hugh Chen
d8ef6bc5af [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I98eb7a2034a40bb28540b2e9dad3b84ecf4d430d
2021-06-28 07:07:00 +00:00
Hugh Chen
c91f8b0991 [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0b6e2fe7b4b98afe4f5eb906b515177f09621946
2021-06-28 07:06:57 +00:00
Hugh Chen
2a2a81dea5 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7d2147f3fc8860e58a4d8cb4e15eb4b09d000c9c
2021-06-28 06:57:36 +00:00
Hugh Chen
064bf9dd81 [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I92ba93b2dccd7fd440b303c241c564af03721944
2021-06-28 06:57:32 +00:00
Hugh Chen
c87b09a9c4 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours am: 0cfe42b287 -s ours am: c6362e92e8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ice6e60ffb90eb289b8a90e57acf0e48c07399d44
2021-06-28 06:52:22 +00:00
Hugh Chen
5a9f761f75 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours am: 3f2394bbc7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I54e4dc25694f503c3d4a48071929abc61be5ad6a
2021-06-28 06:52:18 +00:00
Hugh Chen
b42ecba8a3 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours am: 499cfe303f -s ours am: a539c36421 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8b5ed14819b9919e4bc3781220929b9ebeb858d2
2021-06-28 06:52:13 +00:00
Hugh Chen
8b9dbd066a [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours am: dbcebc42bf -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id00a69e04103f387d0920a628222b5aeff3a3f5d
2021-06-28 06:52:08 +00:00
Hugh Chen
b8aa9ad04d [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id2fe388de56c84cd91effebf9b47e376fcf85e2f
2021-06-28 06:47:52 +00:00
Hugh Chen
d9fc75875e [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I389f623a1ac3a900c6c896ce363d3db1ca8a03d7
2021-06-28 06:47:48 +00:00
Hugh Chen
985d52d0c6 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours am: 0cfe42b287 -s ours am: 49d4c89944 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ice63058d24150556d6b93398c1ca2f5dc76afc08
2021-06-28 06:42:26 +00:00
Hugh Chen
eb41b62299 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours am: f41af1a1e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I04479e17813fe34299739d0ba235a9cc711bf0b2
2021-06-28 06:42:22 +00:00
Hugh Chen
7f4a301b88 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours am: 499cfe303f -s ours am: 48ceb503d8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id62683035962b0c8df55c61fb574c5e86025ad06
2021-06-28 06:42:17 +00:00
Hugh Chen
3e51c20e21 [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours am: 4c2b189379 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibe216a5f6ac77ae34c00eaf915c34397833fd71d
2021-06-28 06:42:13 +00:00
Hugh Chen
49d4c89944 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours am: 0cfe42b287 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I19651eae9672ae29ed50c9b795626b49d062f557
2021-06-28 06:37:50 +00:00
Hugh Chen
f41af1a1e3 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours
am skip reason: subject contains skip directive

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

Change-Id: If1c2a27ab396564127b1bd4d2030ff0a308d9fee
2021-06-28 06:37:47 +00:00
Hugh Chen
48ceb503d8 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours am: 499cfe303f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I245db30a5d520b326015747008037cfaf9f10351
2021-06-28 06:37:37 +00:00
Hugh Chen
4c2b189379 [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8d51b562c0610f609892dd56fe81d70edbbf4109
2021-06-28 06:37:33 +00:00
Hugh Chen
c6362e92e8 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours am: 0cfe42b287 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia9b38945171dae15032adfce0b20756aa32c478b
2021-06-28 06:37:13 +00:00
Hugh Chen
e849d212b7 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I607bc56a88f50087d9e466eaad9a67d0f016463d
2021-06-28 06:37:12 +00:00
Hugh Chen
3f2394bbc7 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I810f4769b8a1c55306af2d8fbda1da427a06f48b
2021-06-28 06:37:08 +00:00
Hugh Chen
368ba20c95 [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3967969e09f69542cc461ca818d5024e7fe33f48
2021-06-28 06:37:08 +00:00
Hugh Chen
a539c36421 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours am: 499cfe303f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I60bd575da426261bfcd112ac4b69d4efe15c6ad2
2021-06-28 06:37:04 +00:00
Hugh Chen
dbcebc42bf [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icd57778b71e3ff3f2300fdd0f335373bd7fce4cd
2021-06-28 06:37:00 +00:00
Hugh Chen
ff719d5bd8 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a am: bee2daea18 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a2a91ce7420f647f5b6c3a76a31686049ba3011
2021-06-28 06:36:30 +00:00
Hugh Chen
60beadd631 [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc -s ours am: 76545f383c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I14dceb2e7d17451f831bdf124387a4e76d744579
2021-06-28 06:36:23 +00:00
Hugh Chen
0cfe42b287 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibf35314504458240ec753c062f284225508701bd
2021-06-28 06:19:08 +00:00
Hugh Chen
367921a80d [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I315047b2c175ac29474ad3b0a261d26d2745e4d8
2021-06-28 06:19:04 +00:00
Hugh Chen
499cfe303f [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3a2ddb2b2f8a2050dc017d2e3b4d9cf840d3a7dc
2021-06-28 06:18:59 +00:00
Hugh Chen
87426af532 [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8d89f0ac05df88cd680a15e8c64c2133b1619e53
2021-06-28 06:18:56 +00:00
Hugh Chen
bc51750bf1 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a am: a11ed686d4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I47d3d52d1f11879e049bef336d0dde464b5de048
2021-06-28 06:18:50 +00:00
Hugh Chen
9eef0e089d [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc am: 91d5f08e39 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4ce2d29b73bd2db7ba3cb74cad46515eba64e425
2021-06-28 06:18:45 +00:00
Hugh Chen
bee2daea18 RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915

Change-Id: I28b33a8286af88bc1b494cd325cb946e9ccca554
2021-06-28 06:15:26 +00:00
Hugh Chen
76545f383c [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc -s ours
am skip reason: skipped by user hughchen

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

Change-Id: Ieec3c3403fe68257bbd3c04ec2395af202e2b28d
2021-06-28 06:15:18 +00:00
Hugh Chen
c551f39977 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifef9d53b072a081c2c78437e4bc77e511024092a
2021-06-28 06:14:41 +00:00
Hugh Chen
9316df9560 [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic3ca73d1126a07c955e10b7871b9ccec0038b60d
2021-06-28 06:14:38 +00:00
Hugh Chen
3fcb9c9811 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I265d8d2c13c97463ba2d9449e68925199b90be3c
2021-06-28 06:14:35 +00:00
Hugh Chen
9f4308daa2 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia1ad9ee7da0a972a3a97aca68d2fb8b6f3061d24
2021-06-28 06:14:30 +00:00
Hugh Chen
505cc44596 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic4237a93471f2064896492eb607447620c0fc21a
2021-06-28 06:07:26 +00:00