Commit Graph

84404 Commits

Author SHA1 Message Date
TreeHugger Robot
555070bcdd [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: b1119ffc7c -s ours am: 0ae43531ef -s ours
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I8ca95141902cef14dfdbf2d6677fb10c5a358934
2021-08-08 14:03:42 +00:00
Weng Su
eae6ec79e3 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 3cb57e2769 -s ours am: 44ceeecf3f -s ours
am skip reason: skipped by user wengsu

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

Change-Id: Ie39e155402d9df57deabb2788b425d2757d2480c
2021-08-08 14:03:37 +00:00
Weng Su
47a2b175e9 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: d93ffd8c3a -s ours am: ead0c8eb2d -s ours
am skip reason: skipped by user wengsu

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

Change-Id: Iaffa3b2a5437d48e59d23446d904dc1bcfd61610
2021-08-08 14:03:36 +00:00
TreeHugger Robot
0ae43531ef [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: b1119ffc7c -s ours
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: Ic6f4a9f4af7a15d86aa7f7569141875590f91192
2021-08-08 13:54:13 +00:00
Weng Su
44ceeecf3f [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 3cb57e2769 -s ours
am skip reason: skipped by user wengsu

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

Change-Id: I8593c428c1337dd5f331af664fd6b14e79733785
2021-08-08 13:54:08 +00:00
Weng Su
ead0c8eb2d [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: d93ffd8c3a -s ours
am skip reason: skipped by user wengsu

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

Change-Id: I6f6f7d911c9d769e4e47727540fc4691319a9b18
2021-08-08 13:54:06 +00:00
TreeHugger Robot
b1119ffc7c [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: Id9fe7fd0621bd78ac529c5ce07097a871d5d3818
2021-08-08 13:39:53 +00:00
TreeHugger Robot
37a5ccd1f0 [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I05e285d6d57f7c9c757b5e7628f1a76678214c7a
2021-08-08 13:39:48 +00:00
Weng Su
3cb57e2769 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours
am skip reason: skipped by user wengsu

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

Change-Id: I5328b3400289af6d6195233efe3addffc3b6306c
2021-08-08 13:39:48 +00:00
Weng Su
d93ffd8c3a [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours
am skip reason: skipped by user wengsu

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

Change-Id: I621f6cddee8b915afdd479a536043b2b50fa48ee
2021-08-08 13:39:46 +00:00
Weng Su
90e455e519 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours
am skip reason: skipped by user wengsu

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

Change-Id: I193f178c5fd49e19b07fe7d011777674a6d6865e
2021-08-08 13:39:44 +00:00
Weng Su
eb1e97e195 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours
am skip reason: skipped by user wengsu

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

Change-Id: I8980230d20465854434b004e18eca553cb2b222b
2021-08-08 13:39:42 +00:00
Weng Su
f973f2ac69 [DO NOT MERGE] Add permission checking to WifiDialogActivity
- Use getCallingPackage() to get calling package.

- Check if the calling package has ACCESS_COARSE_LOCATION or
ACCESS_COARSE_LOCATION permission.

- Only set result data to permission granted callers

Bug: 185126813
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest

Merged-In: If7ca069c842ed2bd1aed23f9d4041473c68a4dad
Change-Id: If7ca069c842ed2bd1aed23f9d4041473c68a4dad
(cherry picked from commit 71e728e934)
2021-08-08 13:21:52 +00:00
TreeHugger Robot
24f87e15e2 [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I39d5571947793d0164cf470942f36d82800f6405
2021-08-08 13:02:10 +00:00
Weng Su
b1c88160e2 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours
am skip reason: skipped by user wengsu

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

Change-Id: I7621025b320cc47c10535daa8dbf48c77c1cf2f6
2021-08-08 13:02:04 +00:00
Weng Su
586ca2dfa8 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours
am skip reason: skipped by user wengsu

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

Change-Id: If5de8e30d74531914febee1636c1b123a6bf0754
2021-08-08 13:02:03 +00:00
TreeHugger Robot
8eff11f477 Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212651

Change-Id: I4394ae315b4458b9d62c825075a120d214f49161
2021-08-07 17:37:47 +00:00
TreeHugger Robot
189d26ff2a Merge "Add comment to AndroidManifest" into qt-dev 2021-08-07 17:18:31 +00:00
Weng Su
8df9b236f8 Add SafetyNet logging am: 62041d683b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15220072

Change-Id: I5a821a0c9bd39e0267635ebfb7ce4a2234f14696
2021-08-07 15:02:15 +00:00
Weng Su
fa62e69c1d Add permission checking to WifiDialogActivity am: 8800cdf527
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212404

Change-Id: Iaa937ab9fe9b071fa27dd9306e9f28ddbd8a00b0
2021-08-07 15:02:13 +00:00
Weng Su
2b7ed69c38 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -s ours
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I5b63a4ecf3f00148137c6de108518cdb430948bc
2021-08-07 14:13:40 +00:00
Weng Su
8a7f073e63 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

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

Change-Id: Ife6f913675a6de6900a021273197aa42e8280f78
2021-08-07 14:13:35 +00:00
Weng Su
7b91612fd0 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I0ffaf1c83a744ae30993c379a244b40f65a2ef04
2021-08-07 14:02:33 +00:00
Weng Su
052d536e07 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

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

Change-Id: Ie0c56032ded21100b3c689922bd03802b6ec9338
2021-08-07 13:58:37 +00:00
Weng Su
adf9fffeff Add comment to AndroidManifest am: fa1e3870d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Change-Id: If6e576072291a47fdd7889db1484bf9450786e53
2021-08-07 13:37:05 +00:00
Weng Su
b659749934 Add comment to AndroidManifest am: fa1e3870d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Change-Id: I00f48e5875c3d60bfa91b61322c36d35b3e38533
2021-08-07 13:37:03 +00:00
Joe Bolinger
0b705abada Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178

Change-Id: I2cebeaef5456520f8d4a40fa20c6c8f469007218
2021-08-07 00:21:37 +00:00
Joe Bolinger
336d3e5501 Merge "Fix extra password confirm prompts during managed setup." into sc-dev 2021-08-07 00:07:22 +00:00
Guojing Yuan
11655705db Remove CDM entries in Connected Device.
BUG: 191992001

Test: Robotest
Change-Id: Ie9cea79f825b78495b1f93527f3fa980f9b975e3
2021-08-06 23:24:24 +00:00
Bonian Chen
a5517006b3 Merge "[Settings] eSIM existance detection rule change" into sc-dev am: 68ac2d69c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15453991

Change-Id: Idb67e48147c633e60c317876abdb19c48fcb90cf
2021-08-06 03:31:26 +00:00
Bonian Chen
68ac2d69c0 Merge "[Settings] eSIM existance detection rule change" into sc-dev 2021-08-06 03:15:49 +00:00
Beverly Tai
6adbe74b92 Merge "Use pattern subtitle string on all enroll stages" into sc-dev am: 60773b9a37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15473086

Change-Id: Ic4dd5daa7ec14ebd94d54ac789a9d93c6ff7b556
2021-08-05 21:50:27 +00:00
Beverly Tai
60773b9a37 Merge "Use pattern subtitle string on all enroll stages" into sc-dev 2021-08-05 21:28:22 +00:00
Joe Bolinger
c11e01f39d Fix extra password confirm prompts during managed setup.
Managed accounts may set the pin/pattern before enrollment begins.

Fix: 191608999
Test: atest BiometricEnrollActivityTest
Change-Id: I4065989ecc26ce72ffd0e06e7c6e68029a11908f
2021-08-05 11:08:48 -07:00
Beverly
c9a609eb6d Use pattern subtitle string on all enroll stages
So the views won't relayout and cause the pattern
to render in a strange way.

Test: manual
Bug: 194368020
Change-Id: If6fd7ade4fd6783fe5d1ef78acc847928e01bd29
2021-08-05 17:17:30 +00:00
Bonian Chen
35df60f316 [Settings] eSIM existance detection rule change
1. eSIM retrieved from SubscriptionManager#getAvailableSubscriptionInfoList()
should be considered as existed all the time.

2. When SIM are both inactive(or active), sorted the ordering based on ordering provided by telephony framework.

Bug: 195090132
Bug: 195091953
Bug: 194197762
Test: local
Change-Id: I2fe43a35e5b7965bde3b579e2297e9cdd89ec228
(cherry picked from commit 848d097b94)
(cherry picked from commit 824deb0ee3727f23ab68a75176825c4c73f482a9)
2021-08-05 06:31:35 +00:00
Bill Yi
f841d3fa4f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a7b2f538d -s ours am: b6321f88ad -s ours
am skip reason: subject contains skip directive

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

Change-Id: If6e7a3f07941a61f16d553f95c13f59529cdcbe4
2021-08-05 05:50:26 +00:00
Bill Yi
b6321f88ad [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a7b2f538d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I49e111e71a2ac12186aa85f0bc37629854a60390
2021-08-05 05:38:19 +00:00
Bill Yi
7805fe0aee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cc662122f -s ours am: 2a1b39c51f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifda89d01ba6bc2fa34a17a24555249e500ded11b
2021-08-05 05:19:45 +00:00
Bill Yi
2a1b39c51f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cc662122f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I08425987f5fac8f5d2650e60d3ca4e837ed1d51a
2021-08-05 05:16:27 +00:00
TreeHugger Robot
ae616ac517 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c47427811f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I70099cce49169ab459d5c3bbdc4c2309d6f0e78a
2021-08-05 05:15:17 +00:00
TreeHugger Robot
c47427811f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-05 05:02:21 +00:00
Bill Yi
0b227f30a9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie28fd41e071cad5ba1955fe0aa17bec63c5d3b92
2021-08-05 02:58:44 +00:00
Bill Yi
1cc662122f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idbf6842dbeed0254bb794514aeed9e8a879ff373
2021-08-05 02:45:34 +00:00
Bill Yi
8a7b2f538d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8dbd19ce27d10100096c6035c5b087ed3f97ca4a
2021-08-05 02:30:41 +00:00
TreeHugger Robot
26aa201d81 Merge "Fix text styling for choose pattern/password screens" into sc-dev am: 66a2f625e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463175

Change-Id: Ifb9bdfac1eae934d032f62cc5d0ec57abe61e0b9
2021-08-04 23:55:03 +00:00
TreeHugger Robot
66a2f625e4 Merge "Fix text styling for choose pattern/password screens" into sc-dev 2021-08-04 23:44:35 +00:00
Curtis Belmonte
6ee789e380 Fix text styling for choose pattern/password screens
Test: Manually trigger SUW and set a device pattern

Fixes: 195069195
Change-Id: Ib19fd0e827af5bdc0896ab4c8cc4fdb8f582cf71
2021-08-04 15:14:38 -07:00
Peter Wang
e098b85711 Merge "Update broadcast intent string to correct format" into sc-dev am: 831d1153e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15406091

Change-Id: I2f8fdf57c5bf00ffd68861daaf2701ac0c1196c0
2021-08-04 18:06:10 +00:00
Peter Wang
831d1153e9 Merge "Update broadcast intent string to correct format" into sc-dev 2021-08-04 17:54:03 +00:00