Etienne Ruffieux
89b43fde97
Merge "Replacing getActiveDevice by btAdapter.getActiveDevices()" am: 7ff6347c57
am: 3ddfa01d4d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1966615
Change-Id: I76c8884f7a3dc56403e1b3616eff79baee67cc7f
2022-02-03 00:18:40 +00:00
Etienne Ruffieux
3ddfa01d4d
Merge "Replacing getActiveDevice by btAdapter.getActiveDevices()" am: 7ff6347c57
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1966615
Change-Id: Ie61c0613fd3124401ab0478685bfc189ca107a87
2022-02-03 00:00:40 +00:00
Etienne Ruffieux
7ff6347c57
Merge "Replacing getActiveDevice by btAdapter.getActiveDevices()"
2022-02-02 23:41:26 +00:00
Etienne Ruffieux
9692c59d3a
Replacing getActiveDevice by btAdapter.getActiveDevices()
...
BluetoothProfile.getActiveDevice() is hidden, packages
should call BluetoothAdapter.getActiveDevices(profile)
instead.
Tag: #feature
Bug: 200202780
Test: build
Change-Id: Id18658de82a7e8292942951a3832a36465a69da3
2022-02-02 15:29:34 +00:00
Jack Yu
147f4bc01d
Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
am: 05dfb08c80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: Ib69851dd1d88fcba84af0cf940b6f949aab15355
2022-01-28 23:14:00 +00:00
Jack Yu
05dfb08c80
Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
am: b85416796d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: I72ccad504b36bd1112660cc180be93c210ae66c4
2022-01-28 22:53:00 +00:00
Jack Yu
b85416796d
Do not let guest user disable secure nfc am: a579ca7554
am: 1009054124
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: I9879ba034ae2b8d7a964a4d6c9d700bad55b636e
2022-01-28 22:31:38 +00:00
Jack Yu
1009054124
Do not let guest user disable secure nfc am: a579ca7554
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691815
Change-Id: Ic68c6849bb65875aea6286d415c66ae8a9f57dfa
2022-01-28 22:19:10 +00:00
Junyu Lai
eb68eb5ec3
Merge "[MS49] Remove NetworkStats hidden Api usages" am: dac3f891ae
am: 21d08383c0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943133
Change-Id: I68723f1f431a8c20c7502b71f2f4945c619ccf7d
2022-01-28 17:07:08 +00:00
Junyu Lai
21d08383c0
Merge "[MS49] Remove NetworkStats hidden Api usages" am: dac3f891ae
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943133
Change-Id: If8ffbe07e9bdd17a6fbcdb4dd143f613ada5d499
2022-01-28 16:48:54 +00:00
Junyu Lai
dac3f891ae
Merge "[MS49] Remove NetworkStats hidden Api usages"
2022-01-28 16:32:59 +00:00
Junyu Lai
e539db77c4
[MS49] Remove NetworkStats hidden Api usages
...
This includes:
1. Remove unused INetworkStatsService and NetworkStatsHistory.
2. Replace NetworkTemplate usages with builder.
3. Replace TrafficStats references to DataUnit.
4. Reimplement NetworkTemplate#normalize.
Test: make RunSettingsRoboTests
Bug: 204830222
(cherry-picked from ag/16724040)
Change-Id: I8efecda5df403e9ed588daecd169cb3498d213a2
Merged-In: I8efecda5df403e9ed588daecd169cb3498d213a2
2022-01-28 13:08:52 +00:00
Bill Yi
dc4bd7f721
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev am: 7793bd6b17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: Ie9fb258fd1c063363b545a0bb5db659f3f207bb4
2022-01-28 03:13:54 +00:00
Bill Yi
a85b3c079b
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
am: 86cab2cd66
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: Ia0e06bf03996897f9619d2e62b899ffd5878b4b5
2022-01-28 03:13:52 +00:00
Bill Yi
7793bd6b17
Merge changes from topic "presubmit-am-35921ce6adc648e489af26a77e4b0f36" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
Import translations. DO NOT MERGE ANYWHERE
2022-01-28 02:54:43 +00:00
Frank Li
752e7a3ba3
Merge "[MS48.2] Remove NetworkStatsHistory from CycleAdaptor" am: cd2bbccf3a
am: 5799ee886b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1942878
Change-Id: I296210366abe8965fba7fe1be48ac3bed1195599
2022-01-27 09:23:35 +00:00
Frank Li
5799ee886b
Merge "[MS48.2] Remove NetworkStatsHistory from CycleAdaptor" am: cd2bbccf3a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1942878
Change-Id: I3f21840dc00f63ad1e0945f44a9a9e560644fb71
2022-01-27 09:01:12 +00:00
Frank Li
cd2bbccf3a
Merge "[MS48.2] Remove NetworkStatsHistory from CycleAdaptor"
2022-01-27 08:47:55 +00:00
Junyu Lai
d7451d16ff
[MS48.2] Remove NetworkStatsHistory from CycleAdaptor
...
While the ChartData changes the types of stored data.
Modify CycleAdaptor accordlingly for the compatibility.
Test: atest clockwork-settings-robotests
make RunSettingsRoboTests -j40
make RunSettingsLibRoboTests
ROBOTEST_FILTER=DataUsageControllerTest
make RunSettingsLibRoboTests
ROBOTEST_FILTER=NetworkCycleChartDataLoaderTest
make RunSettingsLibRoboTests
ROBOTEST_FILTER=NetworkCycleDataForUidLoaderTest
make RunSettingsLibRoboTests
ROBOTEST_FILTER=NetworkCycleDataLoaderTest
make RunSettingsLibRoboTests
ROBOTEST_FILTER=DataUsageUtilsTest
Bug: 204830222
Ignore-AOSP-First: Related API conflict, need master first.
(cherry-picked from ag/16686514)
Change-Id: Ia778d680d5354fb67476db0763dfab017284dc4a
Merged-In: Ia778d680d5354fb67476db0763dfab017284dc4a
2022-01-27 08:46:05 +00:00
Xiao Ma
fc3365f6d5
Merge "Fix EthernetManager.addListener dependency in Tethering settings." am: fa785d2c86
am: 2287aa1993
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952166
Change-Id: I93071ad4ef3ae2e2a333b3e510af82587a34b29c
2022-01-27 07:31:02 +00:00
Xiao Ma
2287aa1993
Merge "Fix EthernetManager.addListener dependency in Tethering settings." am: fa785d2c86
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952166
Change-Id: I324d48263c1d6ff5aa8eddb8917188087383e6f5
2022-01-27 07:13:01 +00:00
Xiao Ma
fa785d2c86
Merge "Fix EthernetManager.addListener dependency in Tethering settings."
2022-01-27 06:59:12 +00:00
Bill Yi
aa11fcd96f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4dab10d29f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712349
Change-Id: If9823276258e918fa2721294a41fb31057a6b723
2022-01-26 15:36:41 +00:00
Etienne Ruffieux
fe5b587245
Merge "Replaced use of Bluetooth resource by SystemApi" am: 49a9361062
am: 6f6f5e6b42
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1939113
Change-Id: Iacc8c75d24c864a55be7b32f4abe1cd09d76f045
2022-01-25 14:44:54 +00:00
Etienne Ruffieux
6f6f5e6b42
Merge "Replaced use of Bluetooth resource by SystemApi" am: 49a9361062
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1939113
Change-Id: Ieb884abbad772e2295f00aba59962472dec3de8d
2022-01-25 14:22:26 +00:00
Etienne Ruffieux
49a9361062
Merge "Replaced use of Bluetooth resource by SystemApi"
2022-01-25 14:00:08 +00:00
Bill Yi
4dab10d29f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic26c56697a7c78fde677f39f63562fa8327d4b2d
2022-01-25 06:29:10 +00:00
Bill Yi
86cab2cd66
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: If1bb4c3824bdba9640309da80b4b7168b32076f3
2022-01-25 06:25:53 +00:00
Bill Yi
e4ca28a0d0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I09e6df9ed565dcd098d1b1a98c51786fe5d87785
2022-01-25 06:25:43 +00:00
Xiao Ma
f621c4ba14
Fix EthernetManager.addListener dependency in Tethering settings.
...
Ethernet service related files are going to be moved into Connectivity
module. EthernetManager.addListener(listener, exectuor) will be exposed
out as module-lib API. Replace the current API usage with the one to be
exposed.
android.os.HandlerExecutor is a hidden API which isn't visible to modules,
try to replace HanlderExecutor class with Handler.post itself although
Setttings can still access this API.
Bug: 210586283
Test: m
Change-Id: I618b43769c68897f4724fae8213181be1cc770c6
2022-01-25 04:49:16 +00:00
Jack Yu
a579ca7554
Do not let guest user disable secure nfc
...
Bug: 209446496
Test: manual
Merged-In: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
Change-Id: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
(cherry picked from commit d9e3e6e4b1
)
2022-01-22 07:56:25 +00:00
TreeHugger Robot
7f1e201765
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 572b59c465
-s ours am: e7e23fad18
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16637238
Change-Id: I8795a29e447ba68fd1c08d93a8a89508103c8843
2022-01-14 18:34:39 +00:00
TreeHugger Robot
e7e23fad18
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 572b59c465
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16637238
Change-Id: I2e677ef2a2c919b027b8c565e6b01be47d4724f4
2022-01-14 18:34:27 +00:00
Bill Yi
9a7585cd87
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6f38c19f8
-s ours am: bbf27131c6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16637484
Change-Id: I5d3a6241ee538a049846b802553435bdaf9a8698
2022-01-14 18:34:24 +00:00
TreeHugger Robot
5714ee98e2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 87e5157b5a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16637488
Change-Id: If38c3dfceaa1a4b436a2ca7f61a6ae7a7b9d3d6f
2022-01-14 18:33:31 +00:00
Bill Yi
bbf27131c6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6f38c19f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16637484
Change-Id: I36a0e9655821f97c5fade9d1890c3987202db953
2022-01-14 18:33:17 +00:00
Bill Yi
64c5aafe71
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d56130c5e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16637242
Change-Id: I00652eaf0ba8ed71a916d0c6f074d33838f62a79
2022-01-14 18:32:39 +00:00
TreeHugger Robot
572b59c465
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2022-01-14 18:09:51 +00:00
TreeHugger Robot
87e5157b5a
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2022-01-14 18:09:47 +00:00
Bill Yi
0eab9c02b9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I962c318f41adcf180b885f2052ce0ec4952edfb6
2022-01-14 09:22:25 +00:00
Bill Yi
a6f38c19f8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib7868c5698aef46813818165545a388552033564
2022-01-14 09:18:54 +00:00
Bill Yi
9d56130c5e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie7fde007b60291d37ac3283c0037c3717b2798be
2022-01-14 09:11:12 +00:00
Bill Yi
3bf676d7ce
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic57de1e9085d2e5ebc2a4eaaa38bdcbc1af70090
2022-01-14 09:09:42 +00:00
TreeHugger Robot
cead5cdd6e
[automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552
-s ours am: 97729a9e16
-s ours am: 8a91ea7add
-s ours am: fc22f7f99f
-s ours
...
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204
Change-Id: I946974d58d0ad5d136e19c801a72b1db186088f9
2022-01-13 22:14:37 +00:00
TreeHugger Robot
fc22f7f99f
[automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552
-s ours am: 97729a9e16
-s ours am: 8a91ea7add
-s ours
...
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204
Change-Id: If75738f8e8c3e4e6febfd77710e81613978153f2
2022-01-13 22:02:06 +00:00
TreeHugger Robot
7f81d953d7
[automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552
-s ours am: 02a19ec59d
-s ours am: 616aecf1ec
-s ours am: 0abbff1a86
-s ours
...
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204
Change-Id: I76abaa00ee0d4d99d452dd4b1be88cca5ac5b6d0
2022-01-13 21:50:50 +00:00
TreeHugger Robot
8a91ea7add
[automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552
-s ours am: 97729a9e16
-s ours
...
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204
Change-Id: If02ad441dd23232075e4fbe9b1927e795aed175e
2022-01-13 21:43:35 +00:00
TreeHugger Robot
0abbff1a86
[automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552
-s ours am: 02a19ec59d
-s ours am: 616aecf1ec
-s ours
...
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204
Change-Id: I3a13d6cf9644292e474c5554e6423072aca2fb67
2022-01-13 21:37:42 +00:00
TreeHugger Robot
616aecf1ec
[automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552
-s ours am: 02a19ec59d
-s ours
...
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204
Change-Id: Iacff1f7f942431bba6f09a9f500a8e60ea394824
2022-01-13 21:25:16 +00:00
TreeHugger Robot
97729a9e16
[automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552
-s ours
...
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204
Change-Id: I0c4662c0cda74c28d2385ade52a345e84086bbc9
2022-01-13 21:06:55 +00:00