TreeHugger Robot
50b53a1c58
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076
-s ours am: b3efaa654e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986293
Change-Id: Ic1f4c1cb5357a491c77bdf93d340d98d59e059b4
2022-02-24 18:38:40 +00:00
Bill Yi
340aa20e39
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a
-s ours am: 3d349c1688
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986293
Change-Id: Ie1a4136bce85ad506e47f66f8806f6af86a4918e
2022-02-24 18:38:38 +00:00
Bill Yi
30a5c5bf0a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84
am: 3913e56dd9
-s ours am: 31a5b89eef
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986289
Change-Id: I4bfb833ef6a25a62bdabc4aa251d0a8930bf22e4
2022-02-24 18:38:22 +00:00
Bill Yi
8bcdd557ad
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 674c4b2104
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986294
Change-Id: Ica0ed6810627f1fd0d72ca966f1096285ef2e40e
2022-02-24 18:37:13 +00:00
TreeHugger Robot
b3efaa654e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986293
Change-Id: I8850b59a5b02dd11a1f8ffaeeb8bb2ef0fabca90
2022-02-24 18:26:27 +00:00
Bill Yi
3d349c1688
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc83e2a05a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986293
Change-Id: Ia0f31cd384cdea4944f63a73a0ec8793a21b11f9
2022-02-24 18:26:24 +00:00
Bill Yi
31a5b89eef
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84
am: 3913e56dd9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986289
Change-Id: Id72c779f290a0e76622bc5dda67dca65c5c63998
2022-02-24 18:26:06 +00:00
TreeHugger Robot
a18ff15076
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2022-02-24 18:05:30 +00:00
Xiao Ma
397b3fe978
Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3
am: b3fedd0633
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461
Change-Id: Ifd244bd60e65937c510a5447c9642225be400e3f
2022-02-24 05:46:28 +00:00
Xiao Ma
b3fedd0633
Merge "Adapt new EthernetManager APIs in Settings." am: 3340b8e3c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1968461
Change-Id: Icc3b8d9fd42ee9712cfc81c74ae886576695ee2a
2022-02-24 05:22:10 +00:00
Xiao Ma
3340b8e3c3
Merge "Adapt new EthernetManager APIs in Settings."
2022-02-24 04:58:26 +00:00
Xiao Ma
db7d7de3b4
Adapt new EthernetManager APIs in Settings.
...
EthernetManager is going to be moved to Connectivity mainline module and
new EthernetManager management APIs have been exposed. This CL adapts
new APIs in the settings in advance, the changes include:
1. use addInterfaceStateListener and removeInterfaceStateListener.
2. rely on the onInterfaceStateChanged callback to receive the Ethernet
interface state update, to replace the getAvailableInterfaces and
getConfiguration.
3. after the Ethernet mainline migration completes, Settings cannot
access the platform resource such as config_ethernet_iface_regex,
instead, check the availability of Ethernet interface by checking
if either any of FEATURE_ETHERNET and FEATURE_USB_HOST is supported.
Bug: 210586283
Bug: 218798003
Test: m
Test: manually verify that device can access the Internet via Ethernet
Test: manually verify that device can share the Internet via Ethernet
tethering
Test: make RunSettingsRoboTests ROBOTEST_FILTER=<modified test cases>
EthernetTetherPreferenceControllerTest
AllInOneTetherSettingsTest
Change-Id: I9e10481e1751975772a24db29568aa26bb85cd70
2022-02-24 01:49:57 +00:00
Bill Yi
674c4b2104
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I42ba3032ed27dd6cc3328c42b6076c9ab07921f3
2022-02-23 08:27:55 +00:00
Bill Yi
fc83e2a05a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If758b66584626c3d33a0be4982d4cb5ed55e4687
2022-02-23 08:24:25 +00:00
Bill Yi
3913e56dd9
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b07f4eca84
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986289
Change-Id: Idd1873b76e7931f2fc0befd3b34dea0acf7fe1cb
2022-02-23 08:21:07 +00:00
Bill Yi
b07f4eca84
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icf0bc906bc6e41539af9fa4200ec6fe24d559b0f
2022-02-23 08:20:54 +00:00
TreeHugger Robot
e647298264
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1c5ae8a124
-s ours am: 1a2962d15b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934956
Change-Id: Ib0efa9857c3e46969c664f6460b793aa2518844a
2022-02-18 17:50:08 +00:00
Bill Yi
e29c0bb725
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
am: 382229bcb6
-s ours am: be2ae00267
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: I0b51595a36d4dcee8c6f6833d05e96a3f697c063
2022-02-18 17:49:34 +00:00
TreeHugger Robot
1a2962d15b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1c5ae8a124
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934956
Change-Id: Iea951572b963b5d7c01f2c98fb298b4c579bc3e8
2022-02-18 17:40:19 +00:00
Bill Yi
be2ae00267
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
am: 382229bcb6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: Ibf22d45eb3d5056bc345ec241c29663a5922b51a
2022-02-18 17:39:27 +00:00
Bill Yi
e2d91a630e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b45dc4ca74
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934957
Change-Id: Ibd6af66701dbe80bcbe1d070ab8ba50e4410387c
2022-02-18 17:37:09 +00:00
TreeHugger Robot
1c5ae8a124
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2022-02-18 17:09:16 +00:00
Bill Yi
b45dc4ca74
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idba594ec1c8ce5633f197c8a91c4db39cb4eb5ab
2022-02-18 03:20:57 +00:00
Bill Yi
b3c81561c2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I97f82f3f3ab3ac037a2b28c4e0c0db21398a605c
2022-02-18 03:17:09 +00:00
Bill Yi
382229bcb6
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16934955
Change-Id: I1b36efd22b8f9c8af9ceeca44656c53010349444
2022-02-18 03:13:47 +00:00
Bill Yi
bfb1c0090c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3127e1d696f00a9d496edaa5ed672ac1820da936
2022-02-18 03:13:28 +00:00
Rahul Sabnis
99e2c9f2f2
Merge "Remove hidden Bluetooth dependencies" am: 2e6f2dcfff
am: 19d5264723
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989146
Change-Id: I59f5ddaa559331d6efd974e7abd719db3d05aafb
2022-02-16 23:18:32 +00:00
Rahul Sabnis
19d5264723
Merge "Remove hidden Bluetooth dependencies" am: 2e6f2dcfff
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989146
Change-Id: Icf270075cf196c75e797f967e721cab8aa0db332
2022-02-16 22:56:11 +00:00
Rahul Sabnis
2e6f2dcfff
Merge "Remove hidden Bluetooth dependencies"
2022-02-16 22:36:25 +00:00
William Escande
a95180f228
Remove hidden Bluetooth dependencies
...
Bug: 217736913
Test: pre-submit
Change-Id: Ib4e12e8e350ffa08b48f58e8256991d7ed4fa013
2022-02-16 20:00:59 +01:00
Treehugger Robot
f5246d8a8c
Merge "Restart the MTP connection when changing transcode enabled" am: 8109ad8033
am: df16e4b74c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1882150
Change-Id: Ib92a9c70e554ff53f452cae5cf45d6be511da39b
2022-02-16 13:33:21 +00:00
Treehugger Robot
df16e4b74c
Merge "Restart the MTP connection when changing transcode enabled" am: 8109ad8033
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1882150
Change-Id: I180666f8edc9fdb69fcdec20b9ae2730240ff923
2022-02-16 13:08:35 +00:00
Treehugger Robot
8109ad8033
Merge "Restart the MTP connection when changing transcode enabled"
2022-02-16 09:58:58 +00:00
Treehugger Robot
b99cd8f159
Merge "Show identity address in the bluetooth details page" am: 5d17cfd938
am: 3ac72d1fd6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952171
Change-Id: I65bec3e2b43dff86f6bc69f52bfba4abcdcce6fb
2022-02-15 06:31:19 +00:00
Treehugger Robot
3ac72d1fd6
Merge "Show identity address in the bluetooth details page" am: 5d17cfd938
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952171
Change-Id: I07ff71fbb60abae09d8a3116542260b709a6a81e
2022-02-15 06:13:57 +00:00
Treehugger Robot
5d17cfd938
Merge "Show identity address in the bluetooth details page"
2022-02-15 05:07:42 +00:00
Treehugger Robot
a3102c477f
Merge "Fix dream settings OWNERS path" am: c6bf492db4
am: 58fb784e7d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1985346
Change-Id: I99530d86b8e1372034bf3f1edaf65c7c809dbb15
2022-02-15 00:55:50 +00:00
Treehugger Robot
58fb784e7d
Merge "Fix dream settings OWNERS path" am: c6bf492db4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1985346
Change-Id: Ifeb24520760d02cefc9ab12ff648203dbd2a988b
2022-02-15 00:42:12 +00:00
Treehugger Robot
c6bf492db4
Merge "Fix dream settings OWNERS path"
2022-02-15 00:22:02 +00:00
Xin Li
7928abd2b2
[automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: da7237b2ed
-s ours
...
am skip reason: Merged-In I962c318f41adcf180b885f2052ce0ec4952edfb6 with SHA-1 0eab9c02b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16845285
Change-Id: I489e0cbc88a0095b34f3b3c260b4a908c764bf55
2022-02-14 18:03:30 +00:00
Xin Li
da7237b2ed
Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master
2022-02-14 17:30:11 +00:00
Lucas Silva
55ce0f7cdd
Fix dream settings OWNERS path
...
Change-Id: I4ebcec52d96cee03448a872984036c314c760eaa
2022-02-14 17:02:16 +00:00
Treehugger Robot
b7077ab55f
Merge "Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT" am: 57238d653c
am: 1a16975a36
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977698
Change-Id: I0196d39d1e8d619a54931492fc89f15b8b5dfc99
2022-02-14 11:49:04 +00:00
Treehugger Robot
1a16975a36
Merge "Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT" am: 57238d653c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977698
Change-Id: Icecb9f0232a86fbbaf8f8d9a22c86aaa40ab234d
2022-02-14 11:27:00 +00:00
Treehugger Robot
57238d653c
Merge "Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT"
2022-02-14 10:50:17 +00:00
Treehugger Robot
a93434b11e
Merge changes Idadf8487,I84d87024 am: e489d46b7c
am: 43b7ae19fb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981855
Change-Id: I38ae0b28716a446c9d30a3fbcf7517d0c74e3d30
2022-02-12 12:35:48 +00:00
William Escande
fe155f50fc
Use allowed system value am: 088a7b87f2
am: f859d0f15d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981854
Change-Id: If7fd42b0a7c006635073a3704ec0af1ac68ada55
2022-02-12 12:35:43 +00:00
Treehugger Robot
43b7ae19fb
Merge changes Idadf8487,I84d87024 am: e489d46b7c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981855
Change-Id: I4ee8583862f590206240d107d9a2a509edea03df
2022-02-12 12:21:09 +00:00
William Escande
f859d0f15d
Use allowed system value am: 088a7b87f2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981854
Change-Id: I757da4bdfd98e460ae66ff1c31d74e2838480a8a
2022-02-12 12:21:08 +00:00
Treehugger Robot
e489d46b7c
Merge changes Idadf8487,I84d87024
...
* changes:
Resolve bluetooth hidden API usages
Use allowed system value
2022-02-12 12:06:16 +00:00