Junyu Lai
e299e37585
Merge "Remove dependencies on hidden network stats APIs"
2022-02-09 09:30:37 +00:00
Tsung-Mao Fang
1e680abc54
Merge "Owners updates" am: af7fc198fb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1962927
Change-Id: I55a50aa88fe57fe70c81e625668cfdb47d6cb476
2022-02-09 06:38:50 +00:00
Tsung-Mao Fang
af7fc198fb
Merge "Owners updates"
2022-02-09 06:22:48 +00:00
Treehugger Robot
ae65af5986
[automerger skipped] Merge "DO NOT MERGE Fix of crash when error messages are triggered" am: 46fc8079dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1966608
Change-Id: I6b38a7fa23d1cdd1af6646b09c990c53fce397b5
2022-02-08 21:01:36 +00:00
Treehugger Robot
46fc8079dd
Merge "DO NOT MERGE Fix of crash when error messages are triggered"
2022-02-08 20:39:45 +00:00
Treehugger Robot
428e9e636e
Merge "Merge SQ1A.220205.002" am: c45b4ab9ae
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1976020
Change-Id: I38d97dff8fcb284120608d2bbfb369a7374a4398
2022-02-08 19:12:24 +00:00
Treehugger Robot
c45b4ab9ae
Merge "Merge SQ1A.220205.002"
2022-02-08 18:52:08 +00:00
Chienyuan
84a9b23ba8
Show identity address in the bluetooth details page
...
Bug: 197044261
Test: build pass
Change-Id: Ic1ef1d575f35c4b37d6f9195ec10dd31ed5bdd5b
2022-02-08 11:29:03 +00:00
Remi NGUYEN VAN
74cf5865cf
Remove dependencies on hidden network stats APIs
...
Replace usage with equivalent stable APIs.
Bug: 197717846
Test: atest SettingsRoboTests
(cherry-picked from ag/16779860)
Change-Id: I4151b831fc83dee9b36292cd7991f9b294ed4ff2
Merged-In: I4151b831fc83dee9b36292cd7991f9b294ed4ff2
2022-02-08 19:06:02 +08:00
Treehugger Robot
6040d46cb0
Merge "Settings: Fix FC when learn more textview help intent is NULL" am: 17e8159641
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1961121
Change-Id: If94e29e72c3ce461e27d028148d2c0e4bdbba9e9
2022-02-08 09:36:17 +00:00
Treehugger Robot
17e8159641
Merge "Settings: Fix FC when learn more textview help intent is NULL"
2022-02-08 09:15:53 +00:00
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
d020a96da1
Merge "Removed mocked BluetoothAdapter" am: a6d4788fa0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960844
Change-Id: I87f5bbb080291bbbf93bad56b77eefe2d67f37bd
2022-02-07 21:34:12 +00:00
Etienne Ruffieux
a6d4788fa0
Merge "Removed mocked BluetoothAdapter"
2022-02-07 21:17:41 +00:00
pingzhi wang
d565d8679f
DO NOT MERGE Fix of crash when error messages are triggered
...
Issue is caused by call FragmentTransaction.commit after
activity saved it's state, then IllegalStateException will be thrown
and Settings will crash.
Bug: 216492911
Test: Manual. First boot up the device and follow the wizard till the
point when register the fingerprint. While adding the fingerprint,
short press the power button and turn off the screen.
Change-Id: I96244fc26d2aa8639538f967d645a6ca4fc7c0ba
Merged-In: I1de23885a9b80fabdc199ad09c35c3f98e86c831
2022-02-04 23:38:47 +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
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
Weng Su
535d47b298
Owners updates
...
- Open to everyone for tests/unit modification
Test: N/A, just owners update
Change-Id: I8f1a13af54c5f995e8171e2bdddb4d01e0eb5f53
2022-01-27 08:46:18 +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
hoffc
b4831d9fde
Settings: Fix FC when learn more textview help intent is NULL
...
Click the learn more textview in footer preference and trigger its help intent action. FC occurs when its help intent is NULL.
Add NULL check and hide the learn more textview if its help intent is not set.
Buganizer: 216401549
Change-Id: I3bad6814ef399d1ecd3003649edf42102478242b
Merged-In: I4e7a7c926205be1179d55d33ada345024c8a44ab
2022-01-27 06:08:19 +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
Julia Reynolds
87d1db904e
Update notification settings OWNERS
...
Change-Id: Ic69ea984ab439f1d2795daf82c516878aed420ce
2022-01-25 21:38:29 +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
TreeHugger Robot
51e3455fb3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 572b59c465
-s ours am: e7e23fad18
-s ours am: 7f1e201765
-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: Iabf003db6b4a69d391de7558ca0c2abedec339ab
2022-01-14 18:52:24 +00:00
Bill Yi
3f8aa72445
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6f38c19f8
-s ours am: bbf27131c6
-s ours am: 9a7585cd87
-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: Ic4c3335464f421bdd11cd0b1eac33fd07635ab8c
2022-01-14 18:52:19 +00:00
TreeHugger Robot
38fcd6362d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 87e5157b5a
-s ours am: 5714ee98e2
-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: Iee685c52023305cd1d7a3747533db5c03d4e396f
2022-01-14 18:52:03 +00:00
Bill Yi
ed8abb4c03
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d56130c5e
-s ours am: 64c5aafe71
-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: Iedc647606d100269f9695c445f028b13b2848d99
2022-01-14 18:51:30 +00:00
TreeHugger Robot
11b7ceed5f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 572b59c465
-s ours am: e7e23fad18
-s ours am: d24b5e76b7
-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: I80702cc824b6bdbcaa1acf36abfda73d94f9f3f0
2022-01-14 18:44:21 +00:00
TreeHugger Robot
d24b5e76b7
[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: I5a498809155d4f5ec438dee622d1fd39bcf68a3f
2022-01-14 18:39:32 +00:00
Bill Yi
cef21b1f0d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6f38c19f8
-s ours am: bbf27131c6
-s ours am: ed6a7764e0
-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: I0fb02bc94d4934244be9f896ed32ab7098880031
2022-01-14 18:37:32 +00:00
TreeHugger Robot
71a6671e1f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 87e5157b5a
-s ours am: dc9cf72aab
-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: Ib053ea13cbf9ffd0760bdb28c8f70dcd8a5f19c8
2022-01-14 18:37:12 +00:00
Bill Yi
a8d53dc128
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d56130c5e
-s ours am: 9af90ac95e
-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: Ib7813deae837eb8512fa0e1ad4db436b0290477c
2022-01-14 18:36:10 +00:00
Bill Yi
0806182787
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0179fc901f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16633908
Change-Id: I34f5ffbd921cbd8676a96aa44cd3d8ec8b90498d
2022-01-14 18:35:42 +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
ed6a7764e0
[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: I8669d09a173bce2a7f640dae6bf8a970d51f85dc
2022-01-14 18:33:23 +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
TreeHugger Robot
dc9cf72aab
[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: I905faea38be17bfb31c559f4a4757d41a1a49a9c
2022-01-14 18:33:11 +00:00