Commit Graph

98025 Commits

Author SHA1 Message Date
TreeHugger Robot
0f897ae650 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-qpr1-dev am: b63f20f7dc am: aaa1683558 -s ours am: 5b115498f0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I877437ac1c6a24678f59cfe4253ebba6852433c6
2021-11-09 07:46:41 +00:00
Automerger Merge Worker
980459703f Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-qpr-dev am: ad30e0abb6 -s ours am: 86e798c998 -s ours am: dc47a4b45f -s ours" 2021-11-09 07:46:34 +00:00
TreeHugger Robot
8b54c4c3c9 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours am: 62e555932c -s ours am: f91da36d0a -s ours am: 2f349df564 -s ours am: 545e867868 -s ours am: d243523f84 -s ours am: 110cac0331 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If1d17ff4caa6f6ac136579101f9e79cf44f60cf5
2021-11-09 07:46:31 +00:00
TreeHugger Robot
48b01c2aea [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-qpr-dev am: ad30e0abb6 -s ours am: 86e798c998 -s ours am: dc47a4b45f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iae2cf9d036bdd5d2aaeb76d532c5b71276f0e779
2021-11-09 07:46:30 +00:00
Automerger Merge Worker
6b7f01f1e2 Merge changes from topic "am-814301c118fd4729b6077a96e185efbe"
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am: d89fa348ed am: 8237448ebf -s ours
  [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d7c50f7952 am: bfc96e1036 -s ours
2021-11-09 07:46:28 +00:00
TreeHugger Robot
d191077de8 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am: d89fa348ed am: 8237448ebf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9bfe03a52cb2b84d68ee10e5aeec9381e7fa9a7c
2021-11-09 07:46:24 +00:00
TreeHugger Robot
0dba250111 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-qpr-dev am: ad30e0abb6 -s ours am: 86e798c998 -s ours am: d37cb4ae1a -s ours am: 83daeb23d3 -s ours am: 2d51de0caa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I31496e9a3780045780525c1901b07347c019bd5d
2021-11-09 07:46:22 +00:00
Hugh Chen
f3d02d0375 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d7c50f7952 am: bfc96e1036 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia393a8dd16e24f6bf0b754ee0535f3b9b31a7b77
2021-11-09 07:46:22 +00:00
TreeHugger Robot
5f45c3c233 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am: d89fa348ed am: d3647e4668 -s ours am: 408ffe7fe9 -s ours am: e6b8e84bcd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7d6081094f5933e9826f953baf912df7c3b86a9a
2021-11-09 07:46:16 +00:00
Hugh Chen
cec7b082ce [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d7c50f7952 am: 4d356edd17 -s ours am: 152b25d7da -s ours am: ffa165cc85 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia3e5900ffd2a824d17f5d50e2fa7ecd27c8287e6
2021-11-09 07:46:15 +00:00
TreeHugger Robot
5b115498f0 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-qpr1-dev am: b63f20f7dc am: aaa1683558 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifbb29be9ad5b8a0d99438989ab757a51f090cd1e
2021-11-09 07:46:10 +00:00
TreeHugger Robot
1be65b00d2 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-qpr1-dev am: b63f20f7dc -s ours am: 598db440f5 -s ours am: bd7e557db9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaa7943d11030fbc9ddf41f3a8cb098066ca0c0b3
2021-11-09 07:46:08 +00:00
Hugh Chen
f7abb08c7c [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: b1adf980a5 am: 4640a2a077 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02c42b3862aa7c0ccb843a5870f710891ec7393a
2021-11-09 07:46:07 +00:00
TreeHugger Robot
110cac0331 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours am: 62e555932c -s ours am: f91da36d0a -s ours am: 2f349df564 -s ours am: 545e867868 -s ours am: d243523f84 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id52ea85f1b17fdb3d1c2c3f497a6ea97fdc9dcf8
2021-11-09 07:46:06 +00:00
TreeHugger Robot
2d51de0caa [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-qpr-dev am: ad30e0abb6 -s ours am: 86e798c998 -s ours am: d37cb4ae1a -s ours am: 83daeb23d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb74135c8f43ece3539d16f78ba1de554c21f6e5
2021-11-09 07:45:59 +00:00
TreeHugger Robot
e6b8e84bcd [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am: d89fa348ed am: d3647e4668 -s ours am: 408ffe7fe9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7dfc4b4c72c6cb0039f8a7e47f4cfd4343c1a86c
2021-11-09 07:45:54 +00:00
Hugh Chen
ffa165cc85 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d7c50f7952 am: 4d356edd17 -s ours am: 152b25d7da -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4998b8f222ee551e634d94d581d6c82e9b8d9616
2021-11-09 07:45:53 +00:00
TreeHugger Robot
e2940c09ad [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-v2-dev am: 8072964193 am: d2ed4d204f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I30d17aa57a09dc08eefc2606e25ab282e4160d5a
2021-11-09 07:45:53 +00:00
Hugh Chen
f8a34abd4b [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 58d81fbbb4 am: be094163b8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iae40581f7c0cb0e2e89fbc85cec5c81b52370d93
2021-11-09 07:45:52 +00:00
TreeHugger Robot
d243523f84 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours am: 62e555932c -s ours am: f91da36d0a -s ours am: 2f349df564 -s ours am: 545e867868 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd2f194049106b756ea602262aba21cc1b9c8196
2021-11-09 07:38:18 +00:00
TreeHugger Robot
83daeb23d3 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-qpr-dev am: ad30e0abb6 -s ours am: 86e798c998 -s ours am: d37cb4ae1a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib543df370d6c654e005ccb429961ac909669eeb7
2021-11-09 07:38:14 +00:00
TreeHugger Robot
408ffe7fe9 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am: d89fa348ed am: d3647e4668 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0d62bae2313edecb9cb9d272af4e06f78b0406a9
2021-11-09 07:38:11 +00:00
Hugh Chen
152b25d7da [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d7c50f7952 am: 4d356edd17 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If2f8ad367d07ef138d0f26a917bc997cae757459
2021-11-09 07:38:10 +00:00
TreeHugger Robot
bd7e557db9 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-qpr1-dev am: b63f20f7dc -s ours am: 598db440f5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a68e9eaf07bc822abae5609a0b5c3f995126c52
2021-11-09 07:35:17 +00:00
TreeHugger Robot
545e867868 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours am: 62e555932c -s ours am: f91da36d0a -s ours am: 2f349df564 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia45b07160ff105a4d11ca9b0aa48d204be96e91f
2021-11-09 07:27:31 +00:00
TreeHugger Robot
d37cb4ae1a [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-qpr-dev am: ad30e0abb6 -s ours am: 86e798c998 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e72de7a8de46bc04df80ac2f77a089c2385da9b
2021-11-09 07:27:25 +00:00
TreeHugger Robot
aaa1683558 Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-qpr1-dev am: b63f20f7dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16144999

Change-Id: I6a0e93088a5aaab9473fb1e10458f69d63ded20c
2021-11-09 07:27:22 +00:00
TreeHugger Robot
d3647e4668 Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am: d89fa348ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145000

Change-Id: I611c57ec36671b8865b86de4935cd6aad6fc3728
2021-11-09 07:27:20 +00:00
Hugh Chen
4640a2a077 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: b1adf980a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16144999

Change-Id: Ieb2beb22a55230c7e7f283f6886b340b7821d67f
2021-11-09 07:27:19 +00:00
TreeHugger Robot
598db440f5 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-qpr1-dev am: b63f20f7dc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id19bc022ea060cfe58d15ce08e375cd2d730aa55
2021-11-09 07:27:18 +00:00
Hugh Chen
4d356edd17 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d7c50f7952
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145000

Change-Id: Ic914d6a53970e9de56a8579ec5f5b6e47a8c55f9
2021-11-09 07:27:18 +00:00
TreeHugger Robot
dc47a4b45f [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-qpr-dev am: ad30e0abb6 -s ours am: 86e798c998 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f4395bc099ff2f764826999d56c0a4a46f75483
2021-11-09 07:25:03 +00:00
TreeHugger Robot
8237448ebf Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am: d89fa348ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145000

Change-Id: I0d61d7704642417deb7731e86f9804e516e61b50
2021-11-09 07:24:59 +00:00
Hugh Chen
bfc96e1036 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d7c50f7952
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145000

Change-Id: I5d38d76fffa58e11ce07d195c684b3de0ee4c491
2021-11-09 07:24:58 +00:00
TreeHugger Robot
2f349df564 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours am: 62e555932c -s ours am: f91da36d0a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0a4630d98fc9e270a52490ba5303e9e7d25c63d8
2021-11-09 07:24:52 +00:00
TreeHugger Robot
86e798c998 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-qpr-dev am: ad30e0abb6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I114793f7b2688fbde9f1f8fb27cef947f32d4c68
2021-11-09 07:24:47 +00:00
TreeHugger Robot
d2ed4d204f Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-v2-dev am: 8072964193
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16130956

Change-Id: I3ee25605c4736ac27fbd06b3702d81722fa6d3fc
2021-11-09 07:24:28 +00:00
Hugh Chen
be094163b8 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 58d81fbbb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16130956

Change-Id: I6572efe48fb0ad0159e0177459d1929aaa4f86ce
2021-11-09 07:24:27 +00:00
TreeHugger Robot
f91da36d0a [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours am: 62e555932c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8cb3818015166cae1304315c880728e146d787f6
2021-11-09 07:02:34 +00:00
TreeHugger Robot
b63f20f7dc Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-qpr1-dev 2021-11-09 06:59:05 +00:00
TreeHugger Robot
ad30e0abb6 Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-qpr-dev 2021-11-09 06:59:03 +00:00
TreeHugger Robot
d89fa348ed Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev 2021-11-09 06:58:49 +00:00
TreeHugger Robot
8072964193 Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-v2-dev 2021-11-09 06:58:39 +00:00
TreeHugger Robot
62e555932c [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I40232a1c9484299932210e03068257f38250bb9d
2021-11-09 06:42:01 +00:00
TreeHugger Robot
7134e1ac35 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9987e661cfb85b5c9aa105105d2cc37fd7240903
2021-11-09 06:15:20 +00:00
TreeHugger Robot
0e8d3e3c35 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4363a8652c623e915daf6439e477385710a30726
2021-11-09 06:01:40 +00:00
TreeHugger Robot
5006367685 Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev 2021-11-09 05:46:16 +00:00
TreeHugger Robot
bf6c779caa Merge "Fix broken tests" 2021-11-08 17:16:46 +00:00
TreeHugger Robot
7e94a9ff62 Merge "Check if pref is disabled by admin" into sc-v2-dev am: 87b3974dfd am: cd467e99d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16199770

Change-Id: Ib57d1de7591e1429440f746839078594fd97dfef
2021-11-08 16:50:47 +00:00
TreeHugger Robot
cd467e99d8 Merge "Check if pref is disabled by admin" into sc-v2-dev am: 87b3974dfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16199770

Change-Id: I670cde971b45484e54b951a90e507acc7ef0c1dc
2021-11-08 16:34:32 +00:00