Commit Graph

90260 Commits

Author SHA1 Message Date
Tom Hsu
d0c1f6eb92 Merge "Let activity of "add language" fit settingsactivity style." into sc-v2-dev am: 50726121b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220935

Change-Id: Ie39a2fc21627305052910669cdacbd16ff329ece
2021-11-10 07:18:12 +00:00
Tom Hsu
50726121b4 Merge "Let activity of "add language" fit settingsactivity style." into sc-v2-dev 2021-11-10 07:06:59 +00:00
Arc Wang
80887b6be3 [Large screen] Shows MobileNetworkActivity in 2-pane
MobileNetworkActivity has launchMode singleTask, it makes
the Activity shows in full screen instead of 2-pane.

This change register SplitPairRule for the Activity to show
in 2-pane. However, there are other objects which starts
MobileNetworkActivity, it still needs later CL to refine
and register SplitPairRule for other objects which starts
MobileNetworkActivity.

Bug: 204039043
Test: manual
      Settings -> Network & Internet -> SIMs
Change-Id: Ia15c17c88efd46c5bb2b41aa21848293b9ff5610
2021-11-10 14:39:47 +08:00
Andrii Kulian
8061973e3d Sticky placeholder and adjacent finish rule in Settings
Bug: 204829538
Test: Open Settings in landscape in two panes, rotate to portrait to stack, rotate back to split
Change-Id: I5790962051d0b01902f3b50e958848eff7cf7334
2021-11-09 22:32:58 -08:00
TreeHugger Robot
0f6c95d4fd Merge "Fix "battery saver" not in the top seaching result for indexing" into sc-v2-dev am: 5afb04e1b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220939

Change-Id: I38c253e43ca1165916550503b13276bcf23b672a
2021-11-10 02:18:39 +00:00
TreeHugger Robot
5afb04e1b8 Merge "Fix "battery saver" not in the top seaching result for indexing" into sc-v2-dev 2021-11-10 02:09:27 +00:00
ykhung
64e49a9393 Fix "battery saver" not in the top seaching result for indexing
Bug: 204964119
Test: make SettingsRoboTests
Change-Id: Ifbbf979abe9e96e7af66ec20173e996793d2703e
2021-11-10 00:11:09 +08: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
Weng Su
0d8a53fa0c [Provider Model] Fixed Internet Settings always showing "Loading"
- The Internet Settings will restart itself if it's launching in lock
screen

- The "Loading" might not be hidden if the activity restarts itself

- Move the postDelayed runnable from onViewCreated() to onStart() to
avoid loss

Bug: 204041345
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I516f1105c74b6c8853a72e71c20d2197495cc0d6
2021-11-09 13:22:19 +00:00
tom hsu
0c0daf7034 Let activity of "add language" fit settingsactivity style.
Bug: 202104027
Test: Maunal test. see b/202104027#5
Change-Id: I1f087885912179bb501ae72d0eb50bb8280dcbc0
2021-11-09 21:22:09 +08: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
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
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
21b6466fbc [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 skip reason: subject contains skip directive

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

Change-Id: I113c32d2df2f17e2bb6efa51b1ce7c2038f5781d
2021-11-09 09:03:46 +00:00
Hugh Chen
42df29c7e8 [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 skip reason: subject contains skip directive

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

Change-Id: Iaf3d9361c221136191d3dc0fa576c114fe85d631
2021-11-09 09:03:44 +00:00
TreeHugger Robot
55295fa0e5 [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 skip reason: subject contains skip directive

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

Change-Id: Ie23dc64b7305a773ba95521a5f2aadc30f10d878
2021-11-09 09:03:33 +00:00
TreeHugger Robot
551e444c47 [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 skip reason: subject contains skip directive

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

Change-Id: If5abd41926afc2cb82860ed4c567be70d3d96daf
2021-11-09 08:54:44 +00:00
Hugh Chen
c1c7d536a2 [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 skip reason: subject contains skip directive

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

Change-Id: Id88b11715e1625ae8c38e7eac92c056eac141c08
2021-11-09 08:54:43 +00:00
TreeHugger Robot
156f041f7c [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 skip reason: subject contains skip directive

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

Change-Id: I42b58743673ceecff96a422c58d536387ad1cca8
2021-11-09 08:54:36 +00:00
Hugh Chen
3d50e716e2 [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 skip reason: subject contains skip directive

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

Change-Id: I08e15ccfc07e9546788988f4abc5403ccbb288ed
2021-11-09 08:54:30 +00:00
TreeHugger Robot
d480d3ce43 [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: 3ad6f2d3ab -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: Ifd21460b4527192ea420dab1f75ed1466c5942e4
2021-11-09 08:49:13 +00:00
Hugh Chen
df111807f2 [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: d5142b1c9f -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: I7eee37350b9ef4a5c46f43db38f01a35803eeaaf
2021-11-09 08:49:12 +00:00
TreeHugger Robot
25b2fdde79 [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: 90d8736e66 -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: I606cebf91fd8216e92702f39d3c5b1c5c02cad59
2021-11-09 08:48:59 +00:00
TreeHugger Robot
7a2bb50ebb [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 skip reason: subject contains skip directive

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

Change-Id: Iccf0bffa9f355c7f08b3db34b33020eb3303a90f
2021-11-09 08:46:54 +00:00
Hugh Chen
24c1a557fc [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 skip reason: subject contains skip directive

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

Change-Id: I33924225134ab91005f5d8411ec93546882e455d
2021-11-09 08:46:53 +00:00
TreeHugger Robot
6b8ae36f00 [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 skip reason: subject contains skip directive

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

Change-Id: Ia25c0bac84c6003a7ec2fc5ee31d6f3622405873
2021-11-09 08:46:46 +00:00
Hugh Chen
6f423d2e28 [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 skip reason: subject contains skip directive

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

Change-Id: I47a6bbaf3200cd0efa13b59c36fc3c42527d569e
2021-11-09 08:46:45 +00:00