Commit Graph

98219 Commits

Author SHA1 Message Date
Julia Reynolds
a1c0dc75cd Properly show conversation settings
... when the backing shortcut is missing, so users can change
notification settings when the shortcut hasn't yet been recreated by the
app when setting up a new device

Test: Robotests (confirmed that the 2 controllers that used
mConversationInfo already tested for null), manual
Fixes: 203991823

Change-Id: I477c6b0aef0d978767788cbfc1bfadea4d36cda8
2021-11-10 14:16:42 -05:00
Julia Reynolds
6c43335181 Merge "Add ability to force rebuild list" 2021-11-09 16:34:10 +00:00
Julia Reynolds
30055e3565 Merge "Update styling of NLS dialog" 2021-11-09 16:30:11 +00:00
TreeHugger Robot
907cbb2129 Merge "Fix incorrect usage for the logging method to cause no data in WW" into sc-v2-dev am: 6f6149c7ba am: 22b763486d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220930

Change-Id: I47be5b62b5a7b407698ba4815415e1abd5a9bd4e
2021-11-09 15:44:26 +00:00
TreeHugger Robot
22b763486d Merge "Fix incorrect usage for the logging method to cause no data in WW" into sc-v2-dev am: 6f6149c7ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220930

Change-Id: Iefc9f1b9719bd1cc57bf79d7d8d873a4f4dbc995
2021-11-09 15:22:38 +00:00
TreeHugger Robot
6f6149c7ba Merge "Fix incorrect usage for the logging method to cause no data in WW" into sc-v2-dev 2021-11-09 15:00:47 +00:00
ykhung
48c3533cd0 Fix incorrect usage for the logging method to cause no data in WW
Fix incorrect usage for the logging method to cause the schedule type
and percentage data is not logged  into the WW, since
MetricsFeatureProvider doesn't support log Pair.of() data into the
WestWorld or Clearcut directly, it is used for EventLogWriter only

Bug: 202906853
Test: make SettingsRoboTests
Change-Id: I0ca87ca96647f025adbd23f9f93a3cbd5f7d8579
2021-11-09 21:01:40 +08:00
TreeHugger Robot
331335820d [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: 1bb96ff4ce -s ours am: 152ba179f4 -s ours am: 551e444c47 -s ours am: e535c2b67c -s ours am: fa15a91ad9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib57e5e22bbaf423a97053785ac436b0f120df191
2021-11-09 09:58:12 +00:00
Hugh Chen
0feacef68a [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: 53c90efd25 -s ours am: 835a9f0718 -s ours am: c1c7d536a2 -s ours am: eeef648740 -s ours am: 8da12696bc -s ours
am skip reason: subject contains skip directive

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

Change-Id: If1ec1e4537af893f843b105c92bdd15168bf35fb
2021-11-09 09:58:11 +00:00
TreeHugger Robot
31fa65eb1a [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: f14d3ca0d8 -s ours am: 8257674c53 -s ours am: 156f041f7c -s ours am: f4486b6d39 -s ours am: dc46129f1d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib94d2bf7ca4fb8f35be5b9a224d7417aeac4b114
2021-11-09 09:58:01 +00:00
Hugh Chen
7957c21d76 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: c403c2bd93 -s ours am: b7c8a85e8d -s ours am: 3d50e716e2 -s ours am: 3fc933fc3e -s ours am: a2b02e7f93 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id3237015e1dec50d60b400ce0b69333f72e8957a
2021-11-09 09:58:00 +00:00
TreeHugger Robot
82ba7b6662 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: 1bb96ff4ce -s ours am: 152ba179f4 -s ours am: 551e444c47 -s ours am: 82ddadaca5 -s ours am: b3e697ce9e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id808c2030c3740c238571b112a561cfe185accd3
2021-11-09 09:57:50 +00:00
Hugh Chen
b61c2ec9e5 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: 53c90efd25 -s ours am: 835a9f0718 -s ours am: c1c7d536a2 -s ours am: d0b5804f61 -s ours am: beea5c7290 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I99e34a7e28ed801ca6f232c80e54e78f49436d42
2021-11-09 09:57:49 +00:00
TreeHugger Robot
28edba36dc [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: f14d3ca0d8 -s ours am: 8257674c53 -s ours am: 156f041f7c -s ours am: 4ece52b415 -s ours am: 9039d6dc85 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I26c695079fc2d09dae2085fb7f564dd5b5ed6ca0
2021-11-09 09:57:39 +00:00
Hugh Chen
6a7402e095 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: c403c2bd93 -s ours am: b7c8a85e8d -s ours am: 3d50e716e2 -s ours am: 99b4f6964a -s ours am: 3aaa818d0e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icb44245d1b8feab607afa8223ba1891da00e3340
2021-11-09 09:57:38 +00:00
TreeHugger Robot
285da24488 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: 1bb96ff4ce -s ours am: 152ba179f4 -s ours am: 7a2bb50ebb -s ours am: e1bc76a7ec -s ours am: b24289cc4c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I65c1445490830b0567ee035434ec6ecce250e9cd
2021-11-09 09:57:27 +00:00
Hugh Chen
aba404e3e0 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: 53c90efd25 -s ours am: 835a9f0718 -s ours am: 24c1a557fc -s ours am: c78c4e1a0c -s ours am: 005182a15b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I921e5d317fc8a127393bb200174e8b96ea9b0460
2021-11-09 09:57:26 +00:00
TreeHugger Robot
98a3348435 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: f14d3ca0d8 -s ours am: 8257674c53 -s ours am: 6b8ae36f00 -s ours am: 1d4532c346 -s ours am: 059e6987c7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I723b53661f5da27a3f4e1419c46a91cb33e5b676
2021-11-09 09:57:14 +00:00
Hugh Chen
f7043d2a41 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: c403c2bd93 -s ours am: b7c8a85e8d -s ours am: 6f423d2e28 -s ours am: f63da59d5f -s ours am: 1357c0b7af -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie9b53d57c885e0a428a8c8740434274dbf99ca17
2021-11-09 09:57:09 +00:00
TreeHugger Robot
fa15a91ad9 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: 1bb96ff4ce -s ours am: 152ba179f4 -s ours am: 551e444c47 -s ours am: e535c2b67c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I15ec2417f4bc7148ff9e2fa51e82bc2e4d544203
2021-11-09 09:46:56 +00:00
Hugh Chen
8da12696bc [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: 53c90efd25 -s ours am: 835a9f0718 -s ours am: c1c7d536a2 -s ours am: eeef648740 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb16debb4cb64335dac944f358df714969871fd9
2021-11-09 09:46:55 +00:00
TreeHugger Robot
dc46129f1d [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: f14d3ca0d8 -s ours am: 8257674c53 -s ours am: 156f041f7c -s ours am: f4486b6d39 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iab7fd94e1fb5e8c1aef0362836d7863df81331a7
2021-11-09 09:46:38 +00:00
Hugh Chen
a2b02e7f93 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: c403c2bd93 -s ours am: b7c8a85e8d -s ours am: 3d50e716e2 -s ours am: 3fc933fc3e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5af76a19d18080d70cd43fdffa477e9a93939f3f
2021-11-09 09:46:33 +00:00
TreeHugger Robot
b3e697ce9e [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: 1bb96ff4ce -s ours am: 152ba179f4 -s ours am: 551e444c47 -s ours am: 82ddadaca5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I22678e0dae85f081b662a71ab56fa906c2473559
2021-11-09 09:34:29 +00:00
Hugh Chen
beea5c7290 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: 53c90efd25 -s ours am: 835a9f0718 -s ours am: c1c7d536a2 -s ours am: d0b5804f61 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I526a6f53267c85b892caaab367b00f9ddc564e82
2021-11-09 09:34:28 +00:00
TreeHugger Robot
9039d6dc85 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: f14d3ca0d8 -s ours am: 8257674c53 -s ours am: 156f041f7c -s ours am: 4ece52b415 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iddffeb8bf04bea1385f8f8ce1f28e57e3a260aef
2021-11-09 09:34:20 +00:00
Hugh Chen
3aaa818d0e [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: c403c2bd93 -s ours am: b7c8a85e8d -s ours am: 3d50e716e2 -s ours am: 99b4f6964a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic07a613e73d7b6ec3142f4a9cde2ba53e12409d0
2021-11-09 09:34:19 +00:00
TreeHugger Robot
b24289cc4c [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: 1bb96ff4ce -s ours am: 152ba179f4 -s ours am: 7a2bb50ebb -s ours am: e1bc76a7ec -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie562b7728a5949413cc74641587f1b3f75d4817a
2021-11-09 09:34:11 +00:00
Hugh Chen
005182a15b [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: 53c90efd25 -s ours am: 835a9f0718 -s ours am: 24c1a557fc -s ours am: c78c4e1a0c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d546d15b76f3587c9505b148083f371416ad65f
2021-11-09 09:34:10 +00:00
TreeHugger Robot
059e6987c7 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: f14d3ca0d8 -s ours am: 8257674c53 -s ours am: 6b8ae36f00 -s ours am: 1d4532c346 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie46ef22da09846d72e4a48f6fa0e56cadeadc358
2021-11-09 09:34:02 +00:00
Hugh Chen
1357c0b7af [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: c403c2bd93 -s ours am: b7c8a85e8d -s ours am: 6f423d2e28 -s ours am: f63da59d5f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia00237b1452adda2a94b9f0ad0e5ba9a4cba2d25
2021-11-09 09:33:58 +00:00
TreeHugger Robot
82ddadaca5 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: 1bb96ff4ce -s ours am: 152ba179f4 -s ours am: 551e444c47 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieaedcf8910b13d82fc823c627e14c98908bad347
2021-11-09 09:26:29 +00:00
Hugh Chen
d0b5804f61 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: 53c90efd25 -s ours am: 835a9f0718 -s ours am: c1c7d536a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib71e4d440991494083ef8f7aa7cb8fc87e5f48b2
2021-11-09 09:26:27 +00:00
TreeHugger Robot
e535c2b67c [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: 1bb96ff4ce -s ours am: 152ba179f4 -s ours am: 551e444c47 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6a0682ddb06eadafd346fd49fc2fe15c9eadd998
2021-11-09 09:26:26 +00:00
Hugh Chen
eeef648740 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: 53c90efd25 -s ours am: 835a9f0718 -s ours am: c1c7d536a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I33b6116cafab180a8e75c872b9abcfbd5f3f708a
2021-11-09 09:26:25 +00:00
TreeHugger Robot
4ece52b415 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: f14d3ca0d8 -s ours am: 8257674c53 -s ours am: 156f041f7c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idee2032a84eec9ac10cf43fccbaba8d8119b3d58
2021-11-09 09:26:18 +00:00
TreeHugger Robot
f4486b6d39 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: f14d3ca0d8 -s ours am: 8257674c53 -s ours am: 156f041f7c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I82e96548df086c709b1c3dce80091c3fe3aaad09
2021-11-09 09:26:17 +00:00
Hugh Chen
99b4f6964a [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: c403c2bd93 -s ours am: b7c8a85e8d -s ours am: 3d50e716e2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I888cf516759c78d3e9847852db0af3092656aa3c
2021-11-09 09:26:16 +00:00
Hugh Chen
3fc933fc3e [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: c403c2bd93 -s ours am: b7c8a85e8d -s ours am: 3d50e716e2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I30fc370da1527da6e7d3e25d25d6ce3b135c6ad6
2021-11-09 09:26:15 +00:00
TreeHugger Robot
6b270e6602 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: 1bb96ff4ce -s ours am: 152ba179f4 -s ours am: 1c0bc276d8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib8b1c2400cc08182ee2c51d3504f2d8013c40495
2021-11-09 09:24:11 +00:00
Hugh Chen
9f9146751b [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: 53c90efd25 -s ours am: 835a9f0718 -s ours am: 21cae1ffef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8cc3166a448f26e2ba0bbd404af1a99017fb05dc
2021-11-09 09:24:09 +00:00
TreeHugger Robot
1bd54ab476 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: f14d3ca0d8 -s ours am: 8257674c53 -s ours am: aca50be7d8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I92ffefc91c4266729511cc9396a9e5781a4d53df
2021-11-09 09:23:58 +00:00
Hugh Chen
d5dae919a6 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: c403c2bd93 -s ours am: b7c8a85e8d -s ours am: 1ad17158e1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I91c08b0aa41cbe54e8f4074d63775fa43c8d2d25
2021-11-09 09:23:53 +00:00
TreeHugger Robot
e1bc76a7ec [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: 1bb96ff4ce -s ours am: 152ba179f4 -s ours am: 7a2bb50ebb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia0ac55fa2096c09a3368ff7cda4bb6a099abdb82
2021-11-09 09:13:35 +00:00
Hugh Chen
c78c4e1a0c [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: 53c90efd25 -s ours am: 835a9f0718 -s ours am: 24c1a557fc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib762995f60f467c505f2b2360936b697f1ae7c93
2021-11-09 09:13:34 +00:00
TreeHugger Robot
1d4532c346 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: f14d3ca0d8 -s ours am: 8257674c53 -s ours am: 6b8ae36f00 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7a71b020fc7344f8d80f2671a1ef41e642fb1374
2021-11-09 09:13:26 +00:00
Hugh Chen
f63da59d5f [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: c403c2bd93 -s ours am: b7c8a85e8d -s ours am: 6f423d2e28 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id683d7caea00a4e298884976c567f5e4c9de8ccf
2021-11-09 09:13:25 +00:00
TreeHugger Robot
73e305dc33 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a15 am: e831e29cfc -s ours am: 0de4048d64 -s ours am: 276b278225 -s ours am: 827efa0900 -s ours am: 21b6466fbc -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: Ia6fa1f7d4c050e02981316df231f3d18d8c7fd7f
2021-11-09 09:13:22 +00:00
Hugh Chen
ed0b87fd2f [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1 am: 56b95bd8c0 -s ours am: 09258363f5 -s ours am: 7a5b3bcd86 -s ours am: dee7e16265 -s ours am: 42df29c7e8 -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: I50a269e44b544cc126ca4411c318a74cd5197eed
2021-11-09 09:13:21 +00:00
TreeHugger Robot
536c097dca [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: 9c1eb61f8e -s ours am: f87658eb94 -s ours am: b950aece42 -s ours am: 955e153815 -s ours am: 55295fa0e5 -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: I214bb148b0f9fdef9037580c929808c9eaff5bc9
2021-11-09 09:13:05 +00:00