Xin Li
3160c1adb3
Merge SQ1A.220205.002
...
Bug: 213904741
Merged-In: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
Change-Id: I6008378cd10c04b931186540b36c93705de6b5c8
2022-02-07 23:19:53 -08:00
Etienne Ruffieux
a6d4788fa0
Merge "Removed mocked BluetoothAdapter"
2022-02-07 21:17:41 +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
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
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
fa785d2c86
Merge "Fix EthernetManager.addListener dependency in Tethering settings."
2022-01-27 06:59:12 +00:00
Etienne Ruffieux
865cad2665
Removed mocked BluetoothAdapter
...
Bluetooth adapter can not be mocked anymore, using config
resource instead.
Tag: #feature
Bug: 216422716
Test: robotest
Change-Id: I92e503cbceb8412031c7f3b08a3e1016d38da18c
2022-01-26 13:26:00 +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
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
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
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
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
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
213d7de48c
Merge "Add QUERY_AUDIO_STATE permission"
2021-12-29 19:26:47 +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
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
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
a3d97ecd74
Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing"
2021-12-20 02:53:33 +00:00
Alice Kuo
27a0274d6e
Add test case - forceUpdate_deviceIsSubDevice_doNothing
...
Bug: 201472540
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest
Change-Id: I1aef6429b39109a09931a94b61f15e9470de3854
2021-12-20 01:35:40 +00:00
Treehugger Robot
bb994f627f
Merge "Settings: Extend the data role swap timeout value"
2021-12-15 06:49:44 +00:00
Android Build Coastguard Worker
0f86669be4
Merge cherrypicks of [16100469, 16184933, 16414971] into sc-qpr1-release.
...
Change-Id: Id8b92050daec05bb9f6f4a94d120af46b15ee1f1
2021-12-15 00:05:26 +00:00
Alex Johnston
3dd874316a
Add non system overlay flag to InstallCaCertificateWarning
...
Bug: 196969991
Test: Manual testing with Settings
Merged-In: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
Change-Id: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
(cherry picked from commit 2f193c8157
)
(cherry picked from commit 02e8f56e67
)
Merged-In:Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4
2021-12-15 00:03:15 +00:00
Bill Yi
d2d3da3850
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6966abfdfdbf672b27528c1761eb23b95aefe521
(cherry picked from commit ffc0ed7b89
)
Merged-In:I6966abfdfdbf672b27528c1761eb23b95aefe521
2021-12-15 00:03:06 +00:00
Yanting Yang
a36d55e8f8
Rephrase dialog message of clear storage dialog for security concern
...
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
(cherry picked from commit 0c359da620
)
(cherry picked from commit 5549bf8cd0
)
Merged-In:I8f0b066de710169ee8b922c44b6519ca21b9c7ef
2021-12-15 00:02:58 +00:00
Xin Li
798e3d7d11
Merge "Merge Android 12 QPR1"
2021-12-14 20:26:01 +00:00
Xin Li
475d27801f
Merge Android 12 QPR1
...
Bug: 210511427
Merged-In: Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed
Change-Id: I750e1a1f03c22a58637ff65825756d849ab089b5
2021-12-14 08:39:13 -08:00
Bonian Chen
54ee717db8
Merge "[Settings] Fix failure test case" am: 57a7978f8c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916457
Change-Id: Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed
2021-12-14 02:30:55 +00:00
Bonian Chen
54e4845d54
Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791
Change-Id: I9c1bd5949a1c76ef3ef97868ada3b850af5bc68e
2021-12-14 02:30:53 +00:00
Bonian Chen
57a7978f8c
Merge "[Settings] Fix failure test case"
2021-12-14 02:09:36 +00:00
Bonian Chen
078f873ccc
Merge "[Settings] Refactor Wifi Calling description text"
2021-12-14 02:09:36 +00:00
SongFerng Wang
a74e6cd2ec
Merge "To disable the preferred network mode UI during calling." am: 9dec28892c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331
Change-Id: Ibdad65e0fc67eed1f57bcf076fe5e8ea577fa21d
2021-12-14 01:58:22 +00:00
SongFerng Wang
9dec28892c
Merge "To disable the preferred network mode UI during calling."
2021-12-14 01:40:36 +00:00
SongFerngWang
ce7d4b730c
To disable the preferred network mode UI during calling.
...
It is the modem limitation, so disable the preferred network mode UI
during calling.
Bug: 206973375
Test: atest EnabledNetworkModePreferenceControllerTest
Change-Id: Ibb2904b4c6ff6de82063862188cc57e5c14b3aa5
Merged-In: Ibb2904b4c6ff6de82063862188cc57e5c14b3aa5
2021-12-14 04:16:44 +08:00
Treehugger Robot
43c08cc42f
Merge "Set the EID in the SIM status page to be copyable" am: eba925809d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1894715
Change-Id: Icbf909388b53ab1846fc2fca27c7c6bb7201a3e6
2021-12-13 14:48:47 +00:00