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
b45c5d0970
[automerger skipped] Add comment to AndroidManifest am: fa1e3870d8
am: b659749934
-s ours am: 7b91612fd0
-s ours am: 9bc34092c5
-s ours am: 5d7f8217ea
-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: I988e48deafacf22c5a1fb38ce4cbefbbe9bd652b
2021-08-07 14:40:25 +00:00
Weng Su
b315686a50
[automerger skipped] Add comment to AndroidManifest am: fa1e3870d8
am: adf9fffeff
-s ours am: 052d536e07
-s ours am: 4be07137ed
-s ours am: a51cf93712
-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: Ic6c2f6e4ef98ad685844ab2dbc99e821de8fa912
2021-08-07 14:40:21 +00:00
Weng Su
2ff9679b47
[automerger skipped] Add comment to AndroidManifest am: fa1e3870d8
am: b659749934
-s ours am: 7b91612fd0
-s ours am: 9bc34092c5
-s ours am: 643ebcefe7
-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: I065e1ee3165d8daacff38036f28cfefb6a7d9cd2
2021-08-07 14:40:05 +00:00
Weng Su
f602af0086
[automerger skipped] Add comment to AndroidManifest am: fa1e3870d8
am: adf9fffeff
-s ours am: 052d536e07
-s ours am: 4be07137ed
-s ours am: 911f5834ea
-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: I74a756680b55ff6e0d5d74bb4d8802bdda23698c
2021-08-07 14:40:01 +00:00
Weng Su
654aa7c6f4
[automerger skipped] Add comment to AndroidManifest am: fa1e3870d8
am: b659749934
-s ours am: 7b91612fd0
-s ours am: 2b7ed69c38
-s ours am: 2378decda4
-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: Idf17eaf8a5f4d644e746c28c22dc6dc139fd541f
2021-08-07 14:39:57 +00:00
Weng Su
64db783b7f
[automerger skipped] Add comment to AndroidManifest am: fa1e3870d8
am: adf9fffeff
-s ours am: 052d536e07
-s ours am: 8a7f073e63
-s ours am: 97423591da
-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: I79989224d7abd818f27bf8453de9380e8aea5e22
2021-08-07 14:39:53 +00:00
Weng Su
5d7f8217ea
[automerger skipped] Add comment to AndroidManifest am: fa1e3870d8
am: b659749934
-s ours am: 7b91612fd0
-s ours am: 9bc34092c5
-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: I7da3b6b12e9547816a83b77fa56332dee15d9aa0
2021-08-07 14:26:54 +00:00
Weng Su
643ebcefe7
[automerger skipped] Add comment to AndroidManifest am: fa1e3870d8
am: b659749934
-s ours am: 7b91612fd0
-s ours am: 9bc34092c5
-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: I13095c03a59fe8d36d023623de696401c96badfe
2021-08-07 14:26:54 +00:00
Weng Su
a51cf93712
[automerger skipped] Add comment to AndroidManifest am: fa1e3870d8
am: adf9fffeff
-s ours am: 052d536e07
-s ours am: 4be07137ed
-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: I5f37094049ff33de6881fd9ff6645d2143fbc897
2021-08-07 14:26:50 +00:00
Weng Su
911f5834ea
[automerger skipped] Add comment to AndroidManifest am: fa1e3870d8
am: adf9fffeff
-s ours am: 052d536e07
-s ours am: 4be07137ed
-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: I376d743eda6363bd3f9a46469b73abfc38f88876
2021-08-07 14:26:50 +00:00
Weng Su
2378decda4
[automerger skipped] Add comment to AndroidManifest am: fa1e3870d8
am: b659749934
-s ours am: 7b91612fd0
-s ours am: 2b7ed69c38
-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: I1234cef9c8095e544099d768474d72fee33e629e
2021-08-07 14:26:35 +00:00
Weng Su
97423591da
[automerger skipped] Add comment to AndroidManifest am: fa1e3870d8
am: adf9fffeff
-s ours am: 052d536e07
-s ours am: 8a7f073e63
-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: Ia25b39166f6de513396f124f7fc951db6dd384d3
2021-08-07 14:26:32 +00:00
Weng Su
9bc34092c5
[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: I3694ac5dadb33fc6488631a2b008ec39c0ac9240
2021-08-07 14:14:25 +00:00
Weng Su
4be07137ed
[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: I02e45b3c9021b7f7d351e8fc9b3a9d7fdfee4c6b
2021-08-07 14:14:21 +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
3016050375
Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501
am: fd115c5db2
am: 59f46b4385
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178
Change-Id: I72884b2523f3093b6bf47a939ee01050fd85befd
2021-08-07 00:54:08 +00:00
Joe Bolinger
8c0c4c0463
Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501
am: fd115c5db2
am: 8fd8c0973e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178
Change-Id: I65c40d0e5cfdfed661aa44844377c0364e65e4fa
2021-08-07 00:53:46 +00:00
Joe Bolinger
0560b36964
Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501
am: 0b705abada
am: 8d0ad43149
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178
Change-Id: Icdb6dd28c9aebea739928d4cd72fc0723820717d
2021-08-07 00:53:39 +00:00
Joe Bolinger
8fd8c0973e
Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501
am: fd115c5db2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178
Change-Id: If8501d3a03dd0283f3244ec9dba80596018239a3
2021-08-07 00:39:35 +00:00
Joe Bolinger
59f46b4385
Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501
am: fd115c5db2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178
Change-Id: I7b3af9b3a11572706110082206b7ec56883b06ce
2021-08-07 00:39:30 +00:00
Joe Bolinger
8d0ad43149
Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501
am: 0b705abada
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178
Change-Id: I7d6949733bf2eb07e15f15ac05a58c469828f5a6
2021-08-07 00:39:14 +00:00
Joe Bolinger
fd115c5db2
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: Ic06afcf18cb02b0255d0626891542af0d85de626
2021-08-07 00:22:35 +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
Bonian Chen
c4cee7a2c4
Merge "[Settings] eSIM existance detection rule change" into sc-dev am: 68ac2d69c0
am: a5517006b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15453991
Change-Id: I2788578b228a06fd4ceb40d9f418a2d7f07b4e76
2021-08-06 03:47:41 +00:00
Bonian Chen
ea9c9df826
Merge "[Settings] eSIM existance detection rule change" into sc-dev am: 68ac2d69c0
am: 23f97347a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15453991
Change-Id: I98572de38df258b03c812f82787555f84106df0a
2021-08-06 03:47:15 +00:00
Bonian Chen
23f97347a3
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: Ia86d71fb7b70dc1ff9c6ff4d2b902b09baf736b2
2021-08-06 03:32:23 +00:00