Weng Su
5c494ff294
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500
am: cbd0883356
-s ours am: 1f4b0eaa6f
-s ours am: 70fce50634
-s ours am: ad77ce9784
-s ours am: d3fd57e2e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163
Change-Id: Ied5c7f628e125c51ba48da50651be42f63fe8ff2
2021-10-08 07:37:11 +00:00
Weng Su
b2761dd93d
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431
am: 457a63ce84
-s ours am: f41979632a
-s ours am: 36a13c0cfe
-s ours am: 6b29f7110a
-s ours am: ec9d3cf201
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162
Change-Id: I5847aeee847dd3199a831b43b4c5053b7993f6a8
2021-10-08 07:37:09 +00:00
Weng Su
163e2e711c
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483
-s ours am: aed1ab9e45
-s ours am: 00e38c59cc
-s ours am: c3531fb273
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: I1c776237e29bd81bb431441a80a58146df1c8e78
2021-10-08 07:36:57 +00:00
Weng Su
4ab81c701e
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2
-s ours am: f05b8fbb79
-s ours am: 107ebcdc9e
-s ours am: 658383d2e3
-s ours
...
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: Ie70befb85b53ebd8f2dbbbba284a763a382ffb23
2021-10-08 07:36:56 +00:00
Weng Su
f19c1f0ed1
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483
-s ours am: 395ac6073c
-s ours am: 374ef0012a
-s ours am: 504af9e6cd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: I7a93c7bfde703c6aefe7c694b5e743bab0226ff6
2021-10-08 07:36:48 +00:00
Weng Su
dadde79d59
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2
-s ours am: d5ff68889c
-s ours am: b885452051
-s ours am: 5c878f37a6
-s ours
...
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: Ic3fc04d5fff6adc00705f085f7180e4190ff6d89
2021-10-08 07:36:46 +00:00
Weng Su
0cf0a56f4d
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d
am: 973211dba5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958174
Change-Id: I8bef2b924470482194232d1b5ac26b690dea286b
2021-10-08 07:36:30 +00:00
Weng Su
90f30c8eba
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859
-s ours am: 77d30c4d0c
-s ours
...
am skip reason: skipped by user wengsu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15951620
Change-Id: I5a04f17a12ef5939b0d5bb70c8ae3b5bd3e6e268
2021-10-08 07:36:29 +00:00
Weng Su
6229244dac
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b
am: 1400ff3139
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958170
Change-Id: Icc37fd645ae7e6ccf17873021e87ca76fbb0b134
2021-10-08 07:36:27 +00:00
Weng Su
d3fd57e2e1
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500
am: cbd0883356
-s ours am: 1f4b0eaa6f
-s ours am: 70fce50634
-s ours am: ad77ce9784
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163
Change-Id: Ie75a528a63e6388a75aa3b7775a04a069b162379
2021-10-08 07:22:44 +00:00
Weng Su
ec9d3cf201
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431
am: 457a63ce84
-s ours am: f41979632a
-s ours am: 36a13c0cfe
-s ours am: 6b29f7110a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162
Change-Id: Id33776fcdd4f347604e6ccc9290dee92ca59a4dd
2021-10-08 07:22:43 +00:00
Weng Su
c3531fb273
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483
-s ours am: aed1ab9e45
-s ours am: 00e38c59cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: I3b3b4fdc30ed2db92f19c0b452fa1cef53d3e841
2021-10-08 07:22:34 +00:00
Weng Su
658383d2e3
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2
-s ours am: f05b8fbb79
-s ours am: 107ebcdc9e
-s ours
...
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: Ie3889e39febe5e07f927e5740b48fc0f30a836db
2021-10-08 07:22:33 +00:00
Weng Su
504af9e6cd
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483
-s ours am: 395ac6073c
-s ours am: 374ef0012a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: I305b55c515a15900ed007c56cb6f5362b3b09c6e
2021-10-08 07:22:28 +00:00
Weng Su
5c878f37a6
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2
-s ours am: d5ff68889c
-s ours am: b885452051
-s ours
...
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: I578872acacdb22c11ef08b1ebb33311d05664475
2021-10-08 07:22:28 +00:00
Weng Su
973211dba5
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958174
Change-Id: Ib42cd4909a5d6265ee2a3181df4c34b0c32a79bb
2021-10-08 07:22:21 +00:00
Weng Su
77d30c4d0c
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859
-s ours
...
am skip reason: skipped by user wengsu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15951620
Change-Id: I5d0fa94c0b09106bb65764ffbd4636209f685c35
2021-10-08 07:22:20 +00:00
Weng Su
1400ff3139
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958170
Change-Id: Ie039408dcee182693303390eca26386ff6c546d2
2021-10-08 07:22:20 +00:00
Bonian Chen
ca721649c8
Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev am: 78c18a1b45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15993432
Change-Id: I1b2cd3afdd506f14f0bb7f8f02299fc8b26116d9
2021-10-08 00:01:10 +00:00
Bonian Chen
78c18a1b45
Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev
2021-10-07 23:42:43 +00:00
TreeHugger Robot
d3de9d4b6c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 57e7d9c4b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000259
Change-Id: Iad798b30be36844d9812501e49da3800115db0c9
2021-10-07 08:52:12 +00:00
TreeHugger Robot
57e7d9c4b3
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-10-07 08:40:47 +00:00
Bill Yi
98f9ed5934
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia9a8641798558c7df5e1d65aadaf5ca9f15fc080
2021-10-07 02:37:16 +00:00
Chen Chen
579e48b03d
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: 2b7a6c4407
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995345
Change-Id: I25d658e8c82a1e45a69fdd3467309e897e10e8d5
2021-10-07 00:44:35 +00:00
Weng Su
ad77ce9784
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500
am: cbd0883356
-s ours am: 1f4b0eaa6f
-s ours am: 70fce50634
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163
Change-Id: Id2f473e2997375f9850ee82452c2507d66257240
2021-10-06 19:38:27 +00:00
Weng Su
6b29f7110a
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431
am: 457a63ce84
-s ours am: f41979632a
-s ours am: 36a13c0cfe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162
Change-Id: I5718fce8f4017922fb851e9295c0702d3f9dadeb
2021-10-06 19:38:24 +00:00
Weng Su
70fce50634
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500
am: cbd0883356
-s ours am: 1f4b0eaa6f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163
Change-Id: Ib2cea64f501887fb069bfdffd68bc8108d656115
2021-10-06 19:29:35 +00:00
Weng Su
36a13c0cfe
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431
am: 457a63ce84
-s ours am: f41979632a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162
Change-Id: I4c861b96d01934a4fd1146df29a77ee9e7dd00ab
2021-10-06 19:29:34 +00:00
Weng Su
00e38c59cc
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483
-s ours am: aed1ab9e45
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: Ie10ab43aaa4b32dd0ef30ec1bb2f7826e13ced7d
2021-10-06 19:22:09 +00:00
Weng Su
107ebcdc9e
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2
-s ours am: f05b8fbb79
-s ours
...
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: I891871e38efd6074d0a0006ccc53c23fdf60ab1c
2021-10-06 19:22:07 +00:00
Weng Su
374ef0012a
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483
-s ours am: 395ac6073c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: I0ab1dd93cd1fcbf872606ebf61477675f9d53d42
2021-10-06 19:20:31 +00:00
Weng Su
b885452051
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2
-s ours am: d5ff68889c
-s ours
...
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: Id84f09761990be63f9aee395c1e5d33bd55450d4
2021-10-06 19:20:30 +00:00
Weng Su
1f4b0eaa6f
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500
am: cbd0883356
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163
Change-Id: Ie0e99006683e0bb1cdf51ac6a70794172319d53b
2021-10-06 19:20:07 +00:00
Weng Su
f41979632a
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431
am: 457a63ce84
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162
Change-Id: I5bdcc75fa22cd4cd5763075b5912c55d56914eb5
2021-10-06 19:20:04 +00:00
Weng Su
18895edd6a
Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev am: d408d7c408
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959643
Change-Id: Idedd5323921e0cd646f34624a485dcbbb92d7a3e
2021-10-06 19:09:49 +00:00
Weng Su
be7746282d
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: f9e7a17247
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959643
Change-Id: If9b1ba5b239307f3f471d9a61e4a9279d3aa1d7c
2021-10-06 19:09:47 +00:00
Weng Su
5ef4ac6048
Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev" into sc-qpr1-dev am: e736eff6db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: If64e864a38e2c68fb7da9e931b1dd14a82fff6e9
2021-10-06 19:09:46 +00:00
Weng Su
d6104f2e72
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: f603e671e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: I644814dfa7c696b1a7df4be6b061f1c6be21092d
2021-10-06 19:09:43 +00:00
Weng Su
aed1ab9e45
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483
-s ours
...
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 4fb84a3737
is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: I3ee28caa937081f910aeb361e3dac5a913de74c7
2021-10-06 19:09:37 +00:00
Weng Su
f05b8fbb79
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2
-s ours
...
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527
is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207911
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: I769f3d5a15c1ee8bf7d4497f46c41e22dc2cc9e1
2021-10-06 19:09:36 +00:00
Weng Su
395ac6073c
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483
-s ours
...
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 4fb84a3737
is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: Ie68ac2947f392a8046c2f62d9c357c852493eb2b
2021-10-06 19:08:50 +00:00
Weng Su
d5ff68889c
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2
-s ours
...
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527
is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207911
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: I18755f444c82aa7f3241812a1f51e0e06c009c07
2021-10-06 19:08:49 +00:00
Weng Su
cbd0883356
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163
Change-Id: I74316633648d6a5002433440358b9a0a443b3cf8
2021-10-06 19:04:58 +00:00
Weng Su
457a63ce84
[RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162
Change-Id: I90af118b9033a7ee53b35aa2b435d2ba95281181
2021-10-06 19:04:56 +00:00
Chen Chen
2b7a6c4407
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
...
Bug: 194300867
Test: Build
Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 18:54:38 +00:00
Weng Su
d408d7c408
Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev
2021-10-06 18:48:39 +00:00
Weng Su
e736eff6db
Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev" into sc-qpr1-dev
...
* changes:
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
[RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
2021-10-06 18:48:39 +00:00
Weng Su
ed4abe8483
Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev
2021-10-06 18:47:52 +00:00
Weng Su
259742ebb2
Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev
...
* changes:
[RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add permission checking to WifiDialogActivity"
[RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add SafetyNet logging"
2021-10-06 18:47:52 +00:00
Bonian Chen
71818bdf15
[Settings] Adopt comfirm SIM deletion to euicc reset UI
...
There's an "Erase downloaded SIMs" option within reset options UI.
When reset EUICC, eSIM profile might get removed.
There's a security feature "Confirm SIM deletion" need to be applied in
this case.
Bug: 194145231
Test: local
Change-Id: I1798dfe347be7d0610a12fb79f103efece2ab240
(cherry picked from commit ebca15a861
)
2021-10-06 16:58:07 +00:00