Commit Graph

89207 Commits

Author SHA1 Message Date
Weng Su
1b5a993750 [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: 6532190ccf -s ours am: e9600f3336 -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: I369ab8a586bb544c45c359ba915a61e83b24e581
2021-10-08 07:52:07 +00:00
Automerger Merge Worker
9ae5da0ee5 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469 -s ours am: 9048523ba4 -s ours am: df1a21033f -s ours" into sc-v2-dev-plus-aosp 2021-10-08 07:51:56 +00:00
Weng Su
d9ff2b5b3f [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: 26b65768ea -s ours am: 5bfc65b1c0 -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: Ia9d81deffac36c6b2bcab16fdb8c4708b224f5f7
2021-10-08 07:51:54 +00:00
TreeHugger Robot
17e60a695f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469 -s ours am: 9048523ba4 -s ours am: df1a21033f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0f52f403214a74c0a7037cae0bc702e83caf1ba
2021-10-08 07:51:53 +00:00
Weng Su
7836d976d8 [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: bd89c97867 -s ours am: c64398a1b9 -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: Iac7e4b9a741ef2d5152fac7161c78b46586825a6
2021-10-08 07:51:53 +00:00
TreeHugger Robot
4210a7bcae Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: 07fe34aa57 am: f5e2d0dcb3 am: 59d01eec17 am: 2370d34040
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: I8b0f587555cd772c2c40ff34dc1f2d6977f47267
2021-10-08 07:51:49 +00:00
Weng Su
e4d6c530c5 [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: 5922df7f44 -s ours am: 9923ea26ef -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: Iaeb9e5d0c3f2b25e46ebe451e7973b5e649f78ef
2021-10-08 07:51:46 +00:00
Weng Su
26ed60de74 [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: e81a5b9a13 -s ours am: 9effff343f -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: I00fd03899e6c39f0884f1fff19c852c5ab4807f5
2021-10-08 07:51:46 +00:00
Automerger Merge Worker
0030a44068 Merge "Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: f40e2700d3 am: 6e2eefe2c5 am: 7e02378a43 am: 3667dd4e0b" into sc-v2-dev-plus-aosp 2021-10-08 07:51:42 +00:00
TreeHugger Robot
497364818f Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: f40e2700d3 am: 6e2eefe2c5 am: 7e02378a43 am: 3667dd4e0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: Ia700d311a395a94a133961863a1643621ce0b2cb
2021-10-08 07:51:39 +00:00
Weng Su
b2cb8a744d [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d am: 1b732ee4cb am: 3d77db28a7 -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: I3a464453d9a732ea717e6db1ba3998342e3c7836
2021-10-08 07:51:38 +00:00
Weng Su
2d82ebf7ec [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859 am: 36558d2c6c -s ours am: c95ed2d0b3 -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: I6c1fdcb67fdf082ffc5ebddfb6fa2ee1a024da9d
2021-10-08 07:51:38 +00:00
Weng Su
9d340d1d94 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b am: 372e90064b am: d243cc3d48 -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: I163aaa857e933fdea664e3e784744580a0be51c7
2021-10-08 07:51:36 +00:00
Automerger Merge Worker
83df22cc79 Merge "Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-dev am: df95750605 am: aeb6c685e1 am: 08aba4bb74" into sc-v2-dev-plus-aosp 2021-10-08 07:51:33 +00:00
TreeHugger Robot
6f4bec749d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469 -s ours am: 9048523ba4 -s ours am: 0194a12bce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I18b3ed4b5f55add9b53022561d9a1482fe0a67ea
2021-10-08 07:51:31 +00:00
TreeHugger Robot
132f6edef1 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-dev am: df95750605 am: aeb6c685e1 am: 08aba4bb74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15987304

Change-Id: I1f1b77a89ffc5f500ef0dd33c5d2aa8612eea0e9
2021-10-08 07:51:29 +00:00
TreeHugger Robot
625e1d612b Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: 07fe34aa57 am: f5e2d0dcb3 am: 59d01eec17 am: e6ef1d5c63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: I41eab1a278bc189da3716678b5ce63189a3f609e
2021-10-08 07:51:28 +00:00
Chen Chen
186fb57c59 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-qpr-dev am: 7efc9b451c am: 3449eccd85 am: 3ca98306af am: ac97c4755d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995587

Change-Id: I83a6c3bd78b0c26261b03dfd344f755544aa62ea
2021-10-08 07:51:24 +00:00
Automerger Merge Worker
f45b3f570b Merge "Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: f40e2700d3 am: 6e2eefe2c5 am: 7e02378a43 am: 293765de71" into sc-v2-dev-plus-aosp 2021-10-08 07:51:21 +00:00
TreeHugger Robot
7ec8334b07 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: f40e2700d3 am: 6e2eefe2c5 am: 7e02378a43 am: 293765de71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: Icb7d61f48f876d55f78be2147cef58c294e41c28
2021-10-08 07:51:19 +00:00
Chen Chen
e81fcc442d BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: d9eca4893d am: ca21133410 am: d0cebdde1a am: ac48c3a2fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984

Change-Id: Ice17afccb6b2b7b73578df49988bd256548234f1
2021-10-08 07:51:17 +00:00
Automerger Merge Worker
7c53f6e464 Merge "Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-dev am: df95750605 am: aeb6c685e1 am: af77052fbe" into sc-v2-dev-plus-aosp 2021-10-08 07:51:13 +00:00
TreeHugger Robot
54875ccaf4 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-dev am: df95750605 am: aeb6c685e1 am: af77052fbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15987304

Change-Id: Ia024450200c065bec159703e8db51c3b7950c3a8
2021-10-08 07:51:11 +00:00
Chen Chen
ac22d747ba BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: 44deff97de am: b51bfd47db am: 5438c59920 am: c849c3ff86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984

Change-Id: Ief58bdf36482c519fc335f176a815f8ad1da1582
2021-10-08 07:51:09 +00:00
Chen Chen
07e4730f10 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-qpr-dev am: 7efc9b451c am: 3449eccd85 am: 3ca98306af am: b5f1d06a88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995587

Change-Id: Ia1f40b63ea0bf999fa16a1952fcec7eb8e1967a2
2021-10-08 07:51:07 +00:00
Automerger Merge Worker
5b40aba16b Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: d9eca4893d am: ca21133410 am: d0cebdde1a am: 28527975e8" into sc-v2-dev-plus-aosp 2021-10-08 07:51:03 +00:00
Chen Chen
d4124597c8 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: d9eca4893d am: ca21133410 am: d0cebdde1a am: 28527975e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984

Change-Id: Ie610834f79fdeade69c00708f998c0c5002a8cde
2021-10-08 07:51:01 +00:00
TreeHugger Robot
d470e7a1aa Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 074f18fd8b am: 9f388f2a66 am: 15189d2ff6 am: ef0bd08a22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986

Change-Id: Ib9c316bc3ebf75b977d045c75d5bb90071e02ac5
2021-10-08 07:51:00 +00:00
Automerger Merge Worker
7eb2501218 Merge "Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 818a481294 am: 050872ecf0 am: cbe25da458 am: d542e403b9" into sc-v2-dev-plus-aosp 2021-10-08 07:50:55 +00:00
Chen Chen
bb58950b4f BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: 44deff97de am: b51bfd47db am: 5438c59920 am: 85fbe04e1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984

Change-Id: Iedc5bf52d954ee60d9ad625d3aa7252466d5e6fb
2021-10-08 07:50:53 +00:00
TreeHugger Robot
0b9ba6b910 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 818a481294 am: 050872ecf0 am: cbe25da458 am: d542e403b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986

Change-Id: Ia28357c422c557c7636c6cbaf2c1e5a856bfde1c
2021-10-08 07:50:52 +00:00
Automerger Merge Worker
89a780e0de Merge changes from topic "am-ea89e571cc6e473fbf0101de439fe785" into sc-v2-dev-plus-aosp
* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -s ours am: 0dc4560066 -s ours am: 68952164ad -s ours am: 9552e28699 -s ours am: aaa0fa040b -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours am: 9ccd76cbde -s ours am: 7ab58102ff -s ours am: 80d84e4053 -s ours am: b462c1d9d5 -s ours am: d763f14341 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500 am: cbd0883356 -s ours am: 1f4b0eaa6f -s ours am: bd3dcfc61a -s ours am: 428d973b15 -s ours am: d9a3681733 -s ours am: c6d1339573 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431 am: 457a63ce84 -s ours am: f41979632a -s ours am: 2323109f93 -s ours am: 77e284042e -s ours am: 6ba2996eec -s ours am: dc73326e39 -s ours
2021-10-08 07:50:47 +00:00
TreeHugger Robot
b34bb6e3fc Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 074f18fd8b am: 9f388f2a66 am: 15189d2ff6 am: 5f0c95ccfc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986

Change-Id: I06701c4029c8408d091cce82262c7d6dd20cf78b
2021-10-08 07:50:44 +00:00
Weng Su
97d7a47022 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -s ours am: 0dc4560066 -s ours am: 68952164ad -s ours am: 9552e28699 -s ours am: aaa0fa040b -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: I882eb98add502d49d302497f171ecd296fab0308
2021-10-08 07:50:44 +00:00
Weng Su
31e7e4cd0d [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours am: 9ccd76cbde -s ours am: 7ab58102ff -s ours am: 80d84e4053 -s ours am: b462c1d9d5 -s ours am: d763f14341 -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: I31a008ee6cb57248a11e1c5cd9589c12119a2ebb
2021-10-08 07:50:43 +00:00
Weng Su
febf461495 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500 am: cbd0883356 -s ours am: 1f4b0eaa6f -s ours am: bd3dcfc61a -s ours am: 428d973b15 -s ours am: d9a3681733 -s ours am: c6d1339573 -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: I6e34565c7b991b5b8042faeba7a6e8b20eb2a85e
2021-10-08 07:50:41 +00:00
Weng Su
839df0e0ea [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431 am: 457a63ce84 -s ours am: f41979632a -s ours am: 2323109f93 -s ours am: 77e284042e -s ours am: 6ba2996eec -s ours am: dc73326e39 -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: I0af9e6c6ad10ef2ce9131da18fd7f9c111fcb1eb
2021-10-08 07:50:40 +00:00
TreeHugger Robot
40eddcf790 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 818a481294 am: 050872ecf0 am: cbe25da458 am: 3a7f8c45d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986

Change-Id: Ia2950879d22b633bf4677dc7fb051d544b5f7040
2021-10-08 07:50:38 +00:00
Automerger Merge Worker
0e8a6be197 Merge changes from topic "am-603210be7bca4b488a2eadf8eec75652" into sc-v2-dev-plus-aosp
* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -s ours am: 0dc4560066 -s ours am: 68952164ad -s ours am: 9552e28699 -s ours am: c2174cc506 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours am: 9ccd76cbde -s ours am: 7ab58102ff -s ours am: 80d84e4053 -s ours am: b462c1d9d5 -s ours am: e51d5d2917 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500 am: cbd0883356 -s ours am: 1f4b0eaa6f -s ours am: bd3dcfc61a -s ours am: 428d973b15 -s ours am: d9a3681733 -s ours am: aa53b5bbc0 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431 am: 457a63ce84 -s ours am: f41979632a -s ours am: 2323109f93 -s ours am: 77e284042e -s ours am: 6ba2996eec -s ours am: d751d3c934 -s ours
2021-10-08 07:50:33 +00:00
Weng Su
d68f0d7484 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -s ours am: 0dc4560066 -s ours am: 68952164ad -s ours am: 9552e28699 -s ours am: c2174cc506 -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: I755ea8ea7fff540c412ddf5e6181ca13d085a408
2021-10-08 07:50:31 +00:00
Weng Su
904b6f53c0 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours am: 9ccd76cbde -s ours am: 7ab58102ff -s ours am: 80d84e4053 -s ours am: b462c1d9d5 -s ours am: e51d5d2917 -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: Id55fcf68d49f0baba9a615af41ad5dbc55bea439
2021-10-08 07:50:30 +00:00
Weng Su
2e8bd9895f [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500 am: cbd0883356 -s ours am: 1f4b0eaa6f -s ours am: bd3dcfc61a -s ours am: 428d973b15 -s ours am: d9a3681733 -s ours am: aa53b5bbc0 -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: I92bb881dc8b272f0100d49dc764aa4860b6ee438
2021-10-08 07:50:29 +00:00
Weng Su
adb23a20bb [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431 am: 457a63ce84 -s ours am: f41979632a -s ours am: 2323109f93 -s ours am: 77e284042e -s ours am: 6ba2996eec -s ours am: d751d3c934 -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: Ia130b28c7d2104171e357359b2d93dc60af0a837
2021-10-08 07:50:28 +00:00
Weng Su
53cc80bc17 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -s ours am: 54abe21d12 -s ours am: c0dd58ee8c -s ours am: 55a37d556e -s ours am: 0e2cd55dfb -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: I68a0a3d5cc5f5e0d14321c003f3e93fa5db63a49
2021-10-08 07:50:25 +00:00
Weng Su
fe473effc8 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours am: 9ccd76cbde -s ours am: 9e73b1e4ed -s ours am: 1dbd53eb70 -s ours am: ba11285fd6 -s ours am: 21636df6f0 -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: Ide30367868c9875c1d696ece4955a8d9da37c6f2
2021-10-08 07:50:24 +00:00
Weng Su
e1ed2d0a49 [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: a4e6370acf -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: I16821cd2d2c8e5c46d92d6f02f0968c3f92ef098
2021-10-08 07:50:23 +00:00
Weng Su
f471e87757 [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: 4212f9d165 -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: I0fb7a2f1d85be9373ff20c1a47fd74e5d41b80ec
2021-10-08 07:50:21 +00:00
Weng Su
b386c3ce8d [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -s ours am: 54abe21d12 -s ours am: c0dd58ee8c -s ours am: 55a37d556e -s ours am: 6cd196ebf9 -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: Ibdbe90b74f3515129bb08deda25888823b983dd8
2021-10-08 07:50:14 +00:00
Weng Su
dd2eb72183 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours am: 9ccd76cbde -s ours am: 9e73b1e4ed -s ours am: 1dbd53eb70 -s ours am: ba11285fd6 -s ours am: 730163ba73 -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: Iee68dada5562f1602b56519227825a98ed2dfbd0
2021-10-08 07:50:13 +00:00
Weng Su
7691126c5c [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: 5c494ff294 -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: Ic73e8871561ae6a2e86a7b629762a6b94bce8071
2021-10-08 07:50:12 +00:00