Commit Graph

89717 Commits

Author SHA1 Message Date
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
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
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
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
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
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
TreeHugger Robot
87b3974dfd Merge "Check if pref is disabled by admin" into sc-v2-dev 2021-11-08 16:16:53 +00:00
TreeHugger Robot
23848cfc80 Merge "AF passwords settings: Start activity as new task." into sc-v2-dev am: 309426bbea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16212117

Change-Id: I59f2c97b65b593857ef4d311ef2f3bd91949e401
2021-11-08 08:32:21 +00:00
TreeHugger Robot
309426bbea Merge "AF passwords settings: Start activity as new task." into sc-v2-dev 2021-11-08 08:18:22 +00:00
TreeHugger Robot
0d252521dd Merge "Fix phone shows incorrect pairing code in pairing dialog" into sc-v2-dev am: 3f5d3cc0f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16183665

Change-Id: If4876e9ebcfc670202d73a03d96a4632850546f4
2021-11-08 07:49:39 +00:00
TreeHugger Robot
3f5d3cc0f3 Merge "Fix phone shows incorrect pairing code in pairing dialog" into sc-v2-dev 2021-11-08 07:34:32 +00:00
Ahaan Ugale
dc816116c5 AF passwords settings: Start activity as new task.
Settings app has a new 2-pane layout for larger screens. Activities that
belong to other apps must now be started as a new task.

Fix: 197702325
Test: manual
Change-Id: Iaf800b7f9e6bf5d925047fed49d848f4d3973df7
2021-11-07 23:10:53 -08:00
Bill Yi
c169c169d5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -s ours am: faac160573 -s ours am: e527e727e7 -s ours am: 96aeb06191 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie4b166f0474a01ed880c643eee6e8b0eed47948e
2021-11-05 18:23:25 +00:00
Bill Yi
41c72cd2f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: db40442194 -s ours am: 55dab4109b -s ours am: d73d791280 -s ours am: 771e4c0903 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I33d4257b7c2bcb7b882711063f2920c4d9b1ec2f
2021-11-05 18:23:18 +00:00
Automerger Merge Worker
90db636af4 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -s ours am: faac160573 -s ours am: e527e727e7 -s ours am: 9ae7fa254e -s ours" into sc-v2-dev-plus-aosp 2021-11-05 18:23:15 +00:00
Bill Yi
aacf8502a6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -s ours am: faac160573 -s ours am: e527e727e7 -s ours am: 9ae7fa254e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7960d7a93f39d88c581ba399e5434d3f678510aa
2021-11-05 18:23:12 +00:00
Bill Yi
b15291fafb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -s ours am: faac160573 -s ours am: 96ccdeda48 -s ours am: c3a99ee089 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib16d3bafdaa077159f810e42c38df588fe5ed7a9
2021-11-05 18:23:11 +00:00
Bill Yi
200bb229ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: db40442194 -s ours am: 55dab4109b -s ours am: d73d791280 -s ours am: eed2435b4b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6010c319c3f9113a4cf2dabbd313d4b8d17cbd87
2021-11-05 18:23:05 +00:00
Bill Yi
5b0e23049d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: db40442194 -s ours am: 55dab4109b -s ours am: 4da7274a20 -s ours am: 0d068e2a70 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0ad09933a8bfe19021c77cf9b805c27d43f0d65e
2021-11-05 18:22:35 +00:00
Julia Reynolds
42896d7fe1 Check if pref is disabled by admin
Test: robotests
Fixes: 137638270
Change-Id: I39953d5b7466281cff7a9a7ffaeb5ba99ab12934
2021-11-05 18:07:58 +00:00
Bill Yi
96aeb06191 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -s ours am: faac160573 -s ours am: e527e727e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If0aae46844a04d8842a8d3f003e8e23aafd898f6
2021-11-05 18:06:01 +00:00
Bill Yi
9ae7fa254e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -s ours am: faac160573 -s ours am: e527e727e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I81a8c72d07bafb4c8b3a4c0147e44bd684d55207
2021-11-05 18:05:56 +00:00
Bill Yi
771e4c0903 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: db40442194 -s ours am: 55dab4109b -s ours am: d73d791280 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib77b336cb7ea5a01e38f6ace71de8de1a1cf381f
2021-11-05 18:05:52 +00:00
Bill Yi
eed2435b4b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: db40442194 -s ours am: 55dab4109b -s ours am: d73d791280 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I34fe73c102d8051cc04561709e5e67f2a8a5f231
2021-11-05 18:05:52 +00:00
Bill Yi
c3a99ee089 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -s ours am: faac160573 -s ours am: 96ccdeda48 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7c7479679513b9e04b65f9531c1c226770841a06
2021-11-05 18:04:39 +00:00
Bill Yi
0d068e2a70 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: db40442194 -s ours am: 55dab4109b -s ours am: 4da7274a20 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icb0946b07b316755b892845d78d777279befa4e0
2021-11-05 18:04:29 +00:00
Bill Yi
e527e727e7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -s ours am: faac160573 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I051b458d8edad5597dde324e587b8454e7f4caca
2021-11-05 17:48:11 +00:00
Bill Yi
d73d791280 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: db40442194 -s ours am: 55dab4109b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6be6e779400ae184c3a31409520f1996e35c413c
2021-11-05 17:48:07 +00:00