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
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
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
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
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
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
Etienne Ruffieux
70c9f89e6f
Replaced use of Bluetooth resource by SystemApi
...
Bluetooth resources are moved to the Bluetooth module,
we need to clear all existing usages of these resources.
Updated existing tests.
Tag: #feature
Test: make RunSettingsRoboTests
Bug: 211570675
Change-Id: I0f76df5043e69ed33cca40af3c32ac5b922b79ef
2022-01-13 17:22:35 +00:00
Treehugger Robot
039cdfd764
Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" am: 0ccb8750b9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943134
Change-Id: I763f17465055f64f42093fac721e06ac2c81b286
2022-01-11 09:26:59 +00:00
Treehugger Robot
0ccb8750b9
Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages"
2022-01-11 09:06:50 +00:00
Junyu Lai
123f2e1581
[MS50] Remove NetworkTemplate#buildTemplate* usages
...
This is a no-op refactoring.
These functions are deprecated and replaced by
NetworkTemplate#Builder, use public API instead.
Test: make RunSettingsLibRoboTests
Bug: 204830222
Change-Id: Idc2a09d8e3789ca2c7a97691cfad4b2e2b417f0d
2022-01-11 02:53:03 +00:00
Treehugger Robot
d7b3c851b5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 48c90fde8a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943804
Change-Id: Ia9a27700f722dc98f1ba8f9ff8f21ce7a2dbc0bd
2022-01-11 01:18:26 +00:00
Treehugger Robot
8b4a0a04f4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fe140a6410
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943805
Change-Id: If6ce83076908961edfe95a2f388d87a06a0efdf2
2022-01-11 01:15:44 +00:00
Treehugger Robot
48c90fde8a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-01-11 00:46:54 +00:00
Treehugger Robot
fe140a6410
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-01-11 00:46:30 +00:00
TreeHugger Robot
8e1e9adc14
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-01-11 00:41:52 +00:00
Bill Yi
0b57480c1a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6f04568a54e4b9ed91a16579f210fd320e317e5e
2022-01-10 17:06:49 +00:00
Bill Yi
87d6f1f523
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I52253a63ba60867e86c9f85474062a03155bf0aa
2022-01-10 17:03:04 +00:00
Bill Yi
e9a027938e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id3b3a757c9db72f3349a135e3b0e28ce34a35d16
2022-01-10 05:45:14 +00:00
Bill Yi
6bc95e2783
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibeeefa1a48fbbebd0779d942f354eb1389130f51
2022-01-10 05:41:40 +00:00
Bill Yi
5ef6e53bf5
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1940736
Change-Id: I08d291860f76cb1993aae826cb6bd85b4430e52e
2022-01-07 17:48:51 +00:00
Bill Yi
75205dc6b3
Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE"
2022-01-07 17:29:12 +00:00
Bill Yi
39df254c94
Merge sc-qpr1 to aosp-master - DO NOT MERGE
...
Merged-In: Id5612dfa82e11037cd95b0ef0f5a507d9c86dd48
Merged-In: I4f51c80cf4e32c384afad849c04c7c6afa065767
Change-Id: Ie466180309fcfe540492967e8bf3587b34928ded
2022-01-06 18:39:02 -08:00
Bill Yi
ea1249b895
Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE
...
Merged-In: I896f9fd68c6cf3ebce5f9b56a6eb9c49d113f0e4
Change-Id: Id5612dfa82e11037cd95b0ef0f5a507d9c86dd48
2022-01-05 21:10:49 -08:00
Chen Xu
688f9d61cd
Merge "eSIM deprecated API test Refactoring" am: a4f936408c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1936017
Change-Id: Iab671e2e10141401921aa0a27a24a4f222570fa0
2022-01-04 19:18:08 +00:00
Chen Xu
cb851c79ae
Merge "[MEP] eSIM deprecated API Refactoring" am: c479598895
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1934924
Change-Id: I1f2e66287f1cdad92515b3d248cacd56991fa38b
2022-01-04 19:18:06 +00:00
Chen Xu
a4f936408c
Merge "eSIM deprecated API test Refactoring"
2022-01-04 18:50:10 +00:00
Chen Xu
c479598895
Merge "[MEP] eSIM deprecated API Refactoring"
2022-01-04 18:50:10 +00:00
SongFerngWang
4fdf8be369
[MEP] eSIM deprecated API Refactoring
...
The telephony APIs were changed, the Settings needs the refactoring.
Bug: 206801604
Test: build pass.
atest QuerySimSlotIndexTest (PASS)
atest SelectableSubscriptionsTest (PASS)
Change-Id: Ic3244333b7d3750b88ecb3dbc5d7036da50b9d4d
Merged-In: Ic3244333b7d3750b88ecb3dbc5d7036da50b9d4d
2022-01-04 10:13:04 +00:00
sandeepjs
dbe31b8e6b
eSIM deprecated API test Refactoring
...
Test: build
Bug: 159354974
Change-Id: Iedeb90f186ab9f82894e2fecef86d339c8989542
Merged-In: Iedeb90f186ab9f82894e2fecef86d339c8989542
2022-01-03 12:15:02 +00:00
Treehugger Robot
f3f9477f6e
Merge "Add QUERY_AUDIO_STATE permission" am: 213d7de48c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928140
Change-Id: Ib1030bc382e25f5e653aa9123b2a800a4a402ad7
2021-12-29 19:44:26 +00:00
Treehugger Robot
213d7de48c
Merge "Add QUERY_AUDIO_STATE permission"
2021-12-29 19:26:47 +00:00
Treehugger Robot
fb9b219b9a
Merge "Clear non bonded device when device picker start" am: 0d0eaad0e3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1931647
Change-Id: I4315b4b7a46760aad836a1ec07202c0e6b669fe6
2021-12-27 06:18:13 +00:00
Treehugger Robot
0d0eaad0e3
Merge "Clear non bonded device when device picker start"
2021-12-27 05:59:50 +00:00
Chienyuan
c5b8ae80ea
Clear non bonded device when device picker start
...
Bug: 205258325
Test: manual
Change-Id: I3de46ef79bcf1f643e5cd762b95ad8056237e2c6
2021-12-24 17:42:54 +08:00
Bonian Chen
d692413d83
Merge "[Settings] Expand the display area of PIN error message" am: 7f348f2ba9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928382
Change-Id: I89ab03dd12306cbcdf1460c9c940253ba0c2b67b
2021-12-22 04:27:08 +00:00
Bonian Chen
7f348f2ba9
Merge "[Settings] Expand the display area of PIN error message"
2021-12-22 04:08:18 +00:00
Bonian Chen
48c945e9b5
[Settings] Expand the display area of PIN error message
...
PIN error message when user operating on PIN lock got long text string.
Which not fit into 2 lines of display area.
This is a change to expand the display area to max. capacity but remain
tightly wrap the text.
Bug: 211176734
Test: local
Change-Id: If175a53de4646d2479b15b10f6b59e4e0870d521
2021-12-21 14:08:58 +08:00
Xin Li
3be43ae165
Merge "Merge SP1A.211205.008" am: 0bf1802bb3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1930705
Change-Id: I8ce5af67e19d864ad3951c15252b0c3496fd56d0
2021-12-21 05:21:38 +00:00
Xin Li
0bf1802bb3
Merge "Merge SP1A.211205.008"
2021-12-21 05:02:44 +00:00
Xin Li
971abb190b
Merge SP1A.211205.008
...
Bug: 205056467
Merged-In: I84848a2801172b46f7cc3ff39d88ad57e34514a4
Change-Id: I4227cf287bd7adffb3241954bd47284b7cd44fdf
2021-12-20 14:15:09 -08:00
William Escande
23ebda4c12
Add QUERY_AUDIO_STATE permission
...
This permission is added to getLastAudibleStream
Bug: 190422401
Tag: #refactor
Test: Build + start a2dp + play music + change volume from DUT/speaker
Change-Id: I65c5e6f50e7b440af57b2a0bd6656db91446578b
2021-12-20 13:45:47 +01:00
Treehugger Robot
9c2293ca92
Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1925621
Change-Id: Ic05e38726cd2f42e919553a11eb0ce6944ce0d20
2021-12-20 03:14:04 +00:00