Weng Su
|
820a18fbbd
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev am: d408d7c408 -s ours am: 8c636a5cb5 -s ours am: 4d19eb8efc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959643
Change-Id: Ic91d6d87b4da8e4d391786b7312677f3caf66323
|
2021-10-06 19:21:13 +00:00 |
|
Weng Su
|
58ca73f4f3
|
Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev" into sc-qpr1-dev am: e736eff6db am: a444b37de0 am: 1b293a76c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: I28592f403ad51cc4b86b1fc50370f25773c4fd0c
|
2021-10-06 19:21:12 +00:00 |
|
Weng Su
|
79b429380b
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: f603e671e7 -s ours am: 11f05bfec4 -s ours am: 098a8d13da -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: I2870e1c8b33c28e9d859922761f7232efb9aaf15
|
2021-10-06 19:21:11 +00:00 |
|
Weng Su
|
f06e103985
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev am: d408d7c408 am: 18895edd6a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959643
Change-Id: I76878029325ca87d044bd5544f069fb25eb9cd5a
|
2021-10-06 19:20:47 +00:00 |
|
Weng Su
|
ffce521166
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: f9e7a17247 am: be7746282d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959643
Change-Id: Ieec005e8887781dd072a5f34c8745f8cebde9700
|
2021-10-06 19:20:46 +00:00 |
|
Weng Su
|
e97eff1471
|
Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev" into sc-qpr1-dev am: e736eff6db am: 5ef4ac6048
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: Ifeb654760ec26796565750942b8cea2205c80010
|
2021-10-06 19:20:45 +00:00 |
|
Weng Su
|
20bf22cbba
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: f603e671e7 am: d6104f2e72 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: If6ff44de98909ba47ec1e29232cc9ee63201dc45
|
2021-10-06 19:20:44 +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
|
d86d17c620
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d am: eb871f3164 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958174
Change-Id: Ibf1fcb1e313464e9fd1b2b1b80e3d41db0409e08
|
2021-10-06 19:20:21 +00:00 |
|
Weng Su
|
0b80680303
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859 am: 5598ec1d23 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15951620
Change-Id: Ifc03e6e2c418ba43a0fef7eb674fbc43ef9dd603
|
2021-10-06 19:20:19 +00:00 |
|
Weng Su
|
48a68e11f8
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b am: 1b0f409000 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958170
Change-Id: I192913971c337ef831953833cb082d939f08d0a6
|
2021-10-06 19:20:17 +00:00 |
|
Weng Su
|
86a02e1e8e
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: I2618b4d77f7e8a98d2f376d94d93ca847e3aa2a1
|
2021-10-06 19:20:09 +00:00 |
|
Weng Su
|
9ccd76cbde
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: I0bea2e41caef5999d0a1920108edba991c63321c
|
2021-10-06 19:20:08 +00:00 |
|
Weng Su
|
9b2d53dbad
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-v2-dev am: fb7d6f3918 am: ed73503009 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959657
Change-Id: Id032f7f8703e9091d7a634a8ef83f4a6be404d70
|
2021-10-06 19:20:08 +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
|
1f17d00fc2
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 5cbaa375cd am: d537fa10e9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959657
Change-Id: Ib452f248d6e96e744819edb8f8fd153e2c49c9e0
|
2021-10-06 19:20:07 +00:00 |
|
Weng Su
|
48c318feca
|
Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev-sc-v2-dev" into sc-v2-dev am: 1c15ca32c2 am: 9e5308a998
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959646
Change-Id: I241d0be3660aa203625a4570e4328eb5fdc25169
|
2021-10-06 19:20:06 +00:00 |
|
Weng Su
|
fe8c04d952
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 34b571612f am: 6662a94c23 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959646
Change-Id: I94b7d92891cc565d51b3ae6b54e0178b085fc136
|
2021-10-06 19:20:05 +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
|
4d19eb8efc
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev am: d408d7c408 -s ours am: 8c636a5cb5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959643
Change-Id: I6df64e1d195771a60ef0dfd38a36e437bbf1c9b6
|
2021-10-06 19:15:05 +00:00 |
|
Weng Su
|
1b293a76c1
|
Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev" into sc-qpr1-dev am: e736eff6db am: a444b37de0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: I841cfec11bfb2e90ddcb26dde095dd71da235b87
|
2021-10-06 19:15:04 +00:00 |
|
Weng Su
|
098a8d13da
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: f603e671e7 -s ours am: 11f05bfec4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: I809ef788ce02ba1f16cb6415760b553fd11fbb3d
|
2021-10-06 19:15:02 +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
|
8c636a5cb5
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev am: d408d7c408 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959643
Change-Id: Ieaafa6731520c51d731d07474855c2a5d4cb9ade
|
2021-10-06 19:09:42 +00:00 |
|
Weng Su
|
a444b37de0
|
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: Ifea597474df5643dd61145c0e2e60c49280c4d9d
|
2021-10-06 19:09:41 +00:00 |
|
Weng Su
|
11f05bfec4
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: f603e671e7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: I8545fa6f77e9f20953c839313d8e418d1a07baf9
|
2021-10-06 19:09:41 +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
|
eb871f3164
|
[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: I31e0d830de9a64550de5150f344f4424cf73a06c
|
2021-10-06 19:08:59 +00:00 |
|
Weng Su
|
5598ec1d23
|
[RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15951620
Change-Id: I2c0700185c68242c201cb52ea581221ce39ae52f
|
2021-10-06 19:08:58 +00:00 |
|
Weng Su
|
1b0f409000
|
[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: Iab725f5469eb82e7b61cf2570edc0d8e7df46ea8
|
2021-10-06 19:08:57 +00:00 |
|
Weng Su
|
ed73503009
|
Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-v2-dev am: fb7d6f3918
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959657
Change-Id: I21ed5cf8b5b3326295af2947f8c620826505f441
|
2021-10-06 19:08:55 +00:00 |
|
Weng Su
|
d537fa10e9
|
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 5cbaa375cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959657
Change-Id: I2c471e927ba5b5fa42099f9adaaf6a3f612a82f6
|
2021-10-06 19:08:53 +00:00 |
|
Weng Su
|
9e5308a998
|
Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev-sc-v2-dev" into sc-v2-dev am: 1c15ca32c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959646
Change-Id: I8d36653e74adbb13144b2d65a58e124983b5e615
|
2021-10-06 19:08:51 +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
|
6662a94c23
|
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 34b571612f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959646
Change-Id: Ica11fe7e996e2e7ddf20572b4d84f1e5637a846c
|
2021-10-06 19:08:49 +00:00 |
|
Weng Su
|
2fe0d45ab8
|
Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: I82807875c1087f54e7c6701ea3cb7e73af9b0352
|
2021-10-06 19:05:00 +00:00 |
|
Weng Su
|
0fe85baf93
|
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: I1060479460cccc4e5e827b3687d3aaa214311ea5
|
2021-10-06 19:04:59 +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
|
ee0f42ec6c
|
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
Bug: 194300867
Test: Build
Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
|
2021-10-06 18:55:19 +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 |
|
Chen Chen
|
31b15330c4
|
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
Bug: 194300867
Test: Build
Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
|
2021-10-06 18:53:07 +00:00 |
|
Chen Chen
|
e5ccfba996
|
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
Bug: 194300867
Test: Build
Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
|
2021-10-06 18:52:44 +00:00 |
|
Chen Chen
|
65a63e76b1
|
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
Bug: 194300867
Test: Build
Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
|
2021-10-06 18:52:10 +00:00 |
|