Automerger Merge Worker
|
73d7b51ada
|
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 am: f45b3f570b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985
Change-Id: If7b79189f9f133cc900cb13dc9931f128781a233
|
2021-10-08 08:08:52 +00:00 |
|
Chen Chen
|
34363961ea
|
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: d9eca4893d am: ca21133410 am: d0cebdde1a am: ac48c3a2fb am: e81fcc442d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: I529343c92512bd5d9e3667e536e48c0761f5236a
|
2021-10-08 08:08:36 +00:00 |
|
Automerger Merge Worker
|
08090b75cb
|
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 am: 7c53f6e464
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15987304
Change-Id: I8ece7069d4838fbd64f598552a741927abdb4fd1
|
2021-10-08 08:08:26 +00:00 |
|
Chen Chen
|
747e1689d4
|
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: 44deff97de am: b51bfd47db am: 5438c59920 am: c849c3ff86 am: ac22d747ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: Iba2b058842ef571f27087c5d773abc14965ac7d1
|
2021-10-08 08:08:14 +00:00 |
|
Chen Chen
|
a8cc91fa15
|
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-qpr-dev am: 7efc9b451c am: 3449eccd85 am: 3ca98306af am: b5f1d06a88 am: 07e4730f10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995587
Change-Id: I9db6f234e8279a60f99b18640ea1d27f4becab10
|
2021-10-08 08:08:04 +00:00 |
|
Automerger Merge Worker
|
41f215e5a2
|
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 am: 5b40aba16b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: I7e9fc4da8437e94fe6b1c095240947000c0d41a0
|
2021-10-08 08:07:56 +00:00 |
|
TreeHugger Robot
|
c00f46203d
|
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 074f18fd8b am: 9f388f2a66 am: 15189d2ff6 am: ef0bd08a22 am: d470e7a1aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986
Change-Id: I6c9b25b6f648456bb0cd21115a1e66411952401d
|
2021-10-08 08:07:39 +00:00 |
|
Automerger Merge Worker
|
a38ad81617
|
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 am: 7eb2501218
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986
Change-Id: Ie225af5bd236071c0ceae19cb2755afe4031f370
|
2021-10-08 08:07:31 +00:00 |
|
Chen Chen
|
a729a76d49
|
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: 44deff97de am: b51bfd47db am: 5438c59920 am: 85fbe04e1c am: bb58950b4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984
Change-Id: Ic588fa2ab827d2146c6d72c1ce3dc148faf672af
|
2021-10-08 08:07:16 +00:00 |
|
Automerger Merge Worker
|
6a3651d10d
|
[automerger skipped] Merge changes from topic "am-ea89e571cc6e473fbf0101de439fe785" into sc-v2-dev-plus-aosp am: 89a780e0de -s ours
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212651
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: I5f25c2c1f4396604128f2877ddf2fcf5082ea663
|
2021-10-08 08:07:07 +00:00 |
|
TreeHugger Robot
|
9c596c294c
|
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 074f18fd8b am: 9f388f2a66 am: 15189d2ff6 am: 5f0c95ccfc am: b34bb6e3fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986
Change-Id: I3715951ac836f67b1c76ba398a60fc483ec22eae
|
2021-10-08 08:06:54 +00:00 |
|
TreeHugger Robot
|
dffe15dd8f
|
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 818a481294 am: 050872ecf0 am: cbe25da458 am: 3a7f8c45d1 am: 40eddcf790
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986
Change-Id: I185d46334bcbc42025fdf84ee110289ce3381e26
|
2021-10-08 08:06:45 +00:00 |
|
Automerger Merge Worker
|
90cfb3c1af
|
[automerger skipped] Merge changes from topic "am-603210be7bca4b488a2eadf8eec75652" into sc-v2-dev-plus-aosp am: 0e8a6be197 -s ours
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212651
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164
Change-Id: Ia78b7a6c1570d2cb9f239bea9122e963b02dd845
|
2021-10-08 08:06:37 +00:00 |
|
Weng Su
|
a42860c224
|
[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: 53cc80bc17 -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: I9f4b038f6152e3d9a09c7b9be49d37678a159dbf
|
2021-10-08 08:06:24 +00:00 |
|
Weng Su
|
b04d7a4752
|
[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: fe473effc8 -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: If4c03b7ff816e2c80cf43a14e0d34b53c27dad50
|
2021-10-08 08:06:23 +00:00 |
|
Weng Su
|
b232d1ac75
|
[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: e1ed2d0a49 -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: If288d006e7c3df2c3fa6b1a5161306e93949eacb
|
2021-10-08 08:06:22 +00:00 |
|
Weng Su
|
15cb9e17bf
|
[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: f471e87757 -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: I5c3ff4f9f40e22de14671510ed0413da8282675c
|
2021-10-08 08:06:20 +00:00 |
|
Weng Su
|
8884783da0
|
[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: b386c3ce8d -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: I94d743651e362bd219c687a99f1a4766d21f1c8d
|
2021-10-08 08:06:04 +00:00 |
|
Weng Su
|
3b662cff60
|
[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: dd2eb72183 -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: I159b07e808a2d203117ed64056146c8afe73bbeb
|
2021-10-08 08:06:03 +00:00 |
|
Weng Su
|
2490766d9d
|
[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: 7691126c5c -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: Icdec732d1509d8e57821003aee521014ac92f505
|
2021-10-08 08:06:01 +00:00 |
|
Weng Su
|
fac54e6bd5
|
[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: b2761dd93d -s ours am: 5ed0bd812b -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: Ia06bdfb733a6e48042e660aa2cebccbf89e10696
|
2021-10-08 08:06:00 +00:00 |
|
Weng Su
|
913b3bed90
|
[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: 0439d3baca -s ours am: 7a5838135c -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: I08b203fbc1db981f2268ac89737fe2ac041eab64
|
2021-10-08 08:05:44 +00:00 |
|
Weng Su
|
ad8686d2a9
|
[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: 097eef0b83 -s ours am: affec36497 -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: I5bec47243eecff4d22e3b6a2d532958ab6a5a97b
|
2021-10-08 08:05:43 +00:00 |
|
Automerger Merge Worker
|
2a4668ccc9
|
[automerger skipped] Merge changes from topic "am-aaa7d89ac39d4f63b72ca511f2b60832" into sc-v2-dev-plus-aosp am: 22a096c969 -s ours
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc 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: I24c7963f542e76992b10ff4f520b3e860d76965f
|
2021-10-08 08:05:35 +00:00 |
|
Weng Su
|
689f915b39
|
[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: 163e2e711c -s ours am: 3853c5e80e -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: If9d6f595f2e13769c13a23dd7a8fb935f81898bd
|
2021-10-08 08:05:25 +00:00 |
|
Weng Su
|
99d62f2613
|
[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: 4ab81c701e -s ours am: a72319cbe9 -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: I531737f19bc964ca56fafd81153f37f459f00c87
|
2021-10-08 08:05:23 +00:00 |
|
Automerger Merge Worker
|
777f105a48
|
[automerger skipped] Merge changes from topic "am-b5e91ab227294ed58bbb399b5c08944f" into sc-v2-dev-plus-aosp am: 19e06f74c8 -s ours
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc 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: I4051584aaddf82f30edb20c6eb27639a7108b148
|
2021-10-08 08:05:15 +00:00 |
|
Weng Su
|
894c660f7e
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d am: 973211dba5 -s ours am: e579105a14 -s ours am: e85d5acafd -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: I6e3b9ebc7b781f75855ce116d3e13e302dbb7eac
|
2021-10-08 08:05:03 +00:00 |
|
Weng Su
|
f07dce2122
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859 -s ours am: 77d30c4d0c -s ours am: bcd7792138 -s ours am: a76039a3b9 -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: Ib5218ad910d324cc7d58507f903be9ef8e2b2e3b
|
2021-10-08 08:05:01 +00:00 |
|
Weng Su
|
2cb9268e34
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b am: 1400ff3139 -s ours am: ca90ea9e47 -s ours am: 5b49dc51be -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: If5bfec0a3b89479e361b981a33a367171986fe3e
|
2021-10-08 08:05:00 +00:00 |
|
Weng Su
|
35a4bbcc2b
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d am: 973211dba5 am: 0cf0a56f4d -s ours am: 1647570721 -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: Iaeab4f4be69faeadaa5485bf54ee3a470a8ddd25
|
2021-10-08 08:04:51 +00:00 |
|
Weng Su
|
6b412b34f1
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859 -s ours am: 77d30c4d0c -s ours am: 90f30c8eba -s ours am: ce5b58b636 -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: I9f161f773c663d8bf60f7905d1b61d0e217b0ade
|
2021-10-08 08:04:50 +00:00 |
|
Weng Su
|
83ed5299d0
|
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b am: 1400ff3139 am: 6229244dac -s ours am: 59b3a8317b -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: I59abb5241302918a11f66b90615b95559059986a
|
2021-10-08 08:04:46 +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 |
|