Commit Graph

89740 Commits

Author SHA1 Message Date
Automerger Merge Worker
da6dcaab16 Merge changes from topic "am-0095f4478dec434bb6286b7944b22006" into sc-v2-dev-plus-aosp
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am: d89fa348ed am: d3647e4668 am: f878351899 -s ours
  [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d7c50f7952 am: 4d356edd17 am: 2ac75e8144 -s ours
2021-11-09 07:46:22 +00:00
TreeHugger Robot
81e6192261 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am: d89fa348ed am: d3647e4668 am: f878351899 -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: I22eadd09cc3ae9661d703dd10ddab590e6d10f42
2021-11-09 07:46:18 +00:00
Automerger Merge Worker
e75bf7fe3b Merge changes from topic "am-0ae48a37c3b346e898e031e9c7937468" into sc-v2-dev-plus-aosp
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a15 am: 9c5b980cbf -s ours am: 52b37ccbdc -s ours am: 9ea7a626ba -s ours am: 15f9ce95d1 -s ours
  [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1 am: f589c5825a -s ours am: 53060241be -s ours am: dca1c2ba08 -s ours am: 8ca55077fa -s ours
2021-11-09 07:46:16 +00:00
Hugh Chen
b207be2e16 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d7c50f7952 am: 4d356edd17 am: 2ac75e8144 -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: Ie2f28aa17a3f32024d1a689402fb2d989bd916f5
2021-11-09 07:46:16 +00:00
TreeHugger Robot
156383bf04 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a15 am: 9c5b980cbf -s ours am: 52b37ccbdc -s ours am: 9ea7a626ba -s ours am: 15f9ce95d1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I90672068514b7dd22532640153775912f2a67e92
2021-11-09 07:46:14 +00:00
Hugh Chen
e4d7f86649 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1 am: f589c5825a -s ours am: 53060241be -s ours am: dca1c2ba08 -s ours am: 8ca55077fa -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic5f92b4a0b25697e93f4cb42bd7a45bd46e159cc
2021-11-09 07:46:13 +00:00
Automerger Merge Worker
64394a2f3a Merge changes from topic "am-e53a8b6326094f7281b3a5f892e28140" into sc-v2-dev-plus-aosp
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-qpr1-dev am: b63f20f7dc am: aaa1683558 -s ours
  [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: b1adf980a5 am: 4640a2a077 -s ours
2021-11-09 07:46:12 +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
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
15f9ce95d1 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a15 am: 9c5b980cbf -s ours am: 52b37ccbdc -s ours am: 9ea7a626ba -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iae46305136ae690f0242ddf0dc2877cae5e66b99
2021-11-09 07:38:25 +00:00
Hugh Chen
8ca55077fa [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1 am: f589c5825a -s ours am: 53060241be -s ours am: dca1c2ba08 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I135d16a2ebbe834590a6ba71c6817384a4e2bde4
2021-11-09 07:38:23 +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
9ea7a626ba [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a15 am: 9c5b980cbf -s ours am: 52b37ccbdc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia00306a6199dc948f8b84f2a5af8d2f92723df31
2021-11-09 07:27:37 +00:00
Hugh Chen
dca1c2ba08 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1 am: f589c5825a -s ours am: 53060241be -s ours
am skip reason: subject contains skip directive

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

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

Change-Id: I70fc1080d78d0705fd1aa92998100eba08688738
2021-11-09 07:27:31 +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
Hugh Chen
2ac75e8144 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d7c50f7952 am: 4d356edd17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145000

Change-Id: I773ccb257984c2d3cb7cdad97dd8b16ad9ca96e4
2021-11-09 07:27:29 +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
52b37ccbdc [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a15 am: 9c5b980cbf -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icd6bee65ff55dd438b26bc5a11451e263cd41acf
2021-11-09 07:24:58 +00:00
Hugh Chen
53060241be [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1 am: f589c5825a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I514509ec73f09d26603ad0946bf73a4f671c3aeb
2021-11-09 07:24:56 +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
9c5b980cbf Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002

Change-Id: I910c297d00b16fbe214b91d3c6bf4a5f68134fd6
2021-11-09 07:02:43 +00:00
Hugh Chen
f589c5825a RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002

Change-Id: I8ac8df9c58b7011a08d98c0d1184944ecebc0893
2021-11-09 07:02:42 +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
effa446a15 Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev 2021-11-09 06:59:01 +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
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