Commit Graph

738 Commits

Author SHA1 Message Date
Goven Liu
ac26cd541c Merge "[Wi-Fi] WiFi Settings inclusive language fix plan phase 1" 2020-07-22 11:06:29 +00:00
govenliu
fec71036f7 [Wi-Fi] WiFi Settings inclusive language fix plan phase 2
Replace WiFi related terms which contain Blacklist,Dummy,Sane or Sanity Check wordings.
Goal: Create a fixit for Android Platform to reduce the use of non-inclusive language for all code.

Bug: 161425297
Test: make RunSettingsRoboTests -j
Change-Id: I1ff89bd2a6636ada1e0f5b9879aecbbd5dab4012
2020-07-22 12:41:01 +08:00
govenliu
b70ddb9df7 [Wi-Fi] WiFi Settings inclusive language fix plan phase 1
Replace WiFi related terms which contain Master wording.
Goal: Create a fixit for Android Platform to reduce the use of non-inclusive language for all code.

Bug: 161425297
Test: make RunSettingsRoboTests -j or
make RunSettingsRoboTests ROBOTEST_FILTER=DashboardFragmentTest
make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=AutomaticStorageManagementSwitchPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=AllInOneTetherPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=TopLevelNetworkEntryPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=PrimarySwitchPreferenceTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiPrimarySwitchPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest

Change-Id: I9395c50e092e124016609f88f7c8151554a0d874
2020-07-21 20:56:22 +08:00
TreeHugger Robot
2432658d23 Merge "Revert "[Wi-Fi] Apply WifiTrackerLib objects in Wi-Fi Slice"" 2020-07-16 15:31:50 +00:00
Greg Kaiser
9e9255fb2a Revert "[Wi-Fi] Apply WifiTrackerLib objects in Wi-Fi Slice"
This reverts commit 7b1aded2a6.

Reason for revert: Settings is crashing for WiFi selection in SetupWizard on wembley

Bug: 161434533
Change-Id: I1d90e9bae1b31862fba674db0d7497e43f987a7f
Test: Locally reverted, reflashed, and was able to select WiFi without Settings crashing.
Exempt-From-Owner-Approval: Revert to clear up P0 while all owners are outside of work hours
2020-07-16 14:47:31 +00:00
Arc Wang
02d279a453 Merge "[Wi-Fi] Apply WifiTrackerLib objects in Wi-Fi Slice" 2020-07-16 09:32:42 +00:00
Arc Wang
7b1aded2a6 [Wi-Fi] Apply WifiTrackerLib objects in Wi-Fi Slice
This change uses WifiTrackerLib's WifiPickerTracker & WifiEntry
to replace SettingLib's WifiTracker & AccessPoint.

This change includes

1. WifiScanWorker has the callbacks similar to a lifecycle component
   but it's not a lifecycle component. Let WifiScanWorker implements
   LifecycleOwner and provides #getLifecycle() for WifiPickerTracker.

2. Remove captive portal related code because WifiEntry#connect will
   handle captive portal login if it's necessary.

3. Create WifiSliceItem to wrap WifiEntry because WifiEntry is an
   abstract object and it does not provide copy constructor.
   Without copy construcor, Wi-Fi Slice may show unexpected information
   when a WifiEntry is updated.

4. Use WifiTrackerLib's NetworkDetailsTracker & WifiEntry in
   WifiDialogActivity because it gets a WifiEntry key from Wi-Fi Slice.
   NetworkDetailsTracker can get the WifiEntry of th key.

Bug: 155613549
Bug: 152571756
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.slice
      make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I0718f4647cea007a9b701922f3121a388dd43918
2020-07-16 15:56:42 +08:00
Bonian Chen
a5f08854e3 [Settings] Inclusive language for Data Usage
Change wordings in data usage part into inclusive language.

Bug: 160707804
Test: make RunSettingsRoboTests
Change-Id: I713e52df8201413b884257a51bc1f71a0d43179d
2020-07-15 02:52:32 +00:00
govenliu
d9644462fa [Wi-Fi] Fix AddAppNetworksFragmentTest one unit test failed case
onDestroy_quitWorkerThread in AddAppNetworksFragmentTest failed due to java.lang.IllegalStateException: no event down from INITIALIZED
Solution: Initialize fragment before calling the onDestroy API.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest
Change-Id: I80d28c6e7490a36a7ff26313d30d33b2f7d727c1
2020-06-25 19:37:12 +08:00
Arc Wang
fb2b144413 Merge "[Wi-Fi] Apply WifiTrackerLib objects in NetworkRequestDialogFragment" 2020-06-21 14:25:18 +00:00
Arc Wang
97659b2dfc [Wi-Fi] Apply WifiTrackerLib objects in NetworkRequestDialogFragment
Bug: 152571756
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ie6f63cb8aa81d61bfa41687c73f8c8764cb3cefe
2020-06-19 19:15:42 +08:00
Jason Chiu
3e7ae1b547 Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f am: e623f69f29 am: a4e005e0ef am: cab15b0d65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792

Change-Id: I183c512bfec686df0e9c3de50fc7252ccff66663
2020-06-18 12:03:52 +00:00
Jason Chiu
0625bb4815 Fix the overlapping problem of the burst of slice updates
Implement a throttle in SliceBackgroundWorker to control slice updates.

Test: robotest
Fixes: 152366832
Change-Id: I8b65d1b57973e036b932172627aca506f4fae3a4
2020-06-18 02:18:38 +08:00
Mark Chien
75b2a75ccd Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6 am: 10ef08d80f am: 78b4bc6020 am: 1912ee3e9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846

Change-Id: I78a0a2d461fd96f2af1850c74d78cd34060e66cc
2020-06-15 07:20:22 +00:00
Mark Chien
49b74e24d6 Merge "Remove schedule recheck logic from TetherService" into rvc-dev 2020-06-15 06:23:11 +00:00
Roshan Pius
924e9e39c1 NetworkRequestDialog: Exit the dialog on connect failure
Connection failure (similar to connection success) is the end of the
processng of a request. We should dismiss the dialog on connection
failure.

Bug: 158844146
Bug: 158616070
Test: Manual tests - Simulate connection failure and ensure that the
dialog vanishes with a toast.

Change-Id: I625ca76298ed549dbed76d398aea0c957c9102fc
Merged-In: I625ca76298ed549dbed76d398aea0c957c9102fc
2020-06-14 15:19:30 +00:00
Roshan Pius
81f9391105 NetworkRequestDialog: Exit the dialog on connect failure
Connection failure (similar to connection success) is the end of the
processng of a request. We should dismiss the dialog on connection
failure.

Bug: 158844146
Test: Manual tests - Simulate connection failure and ensure that the
dialog vanishes with a toast.

Change-Id: I625ca76298ed549dbed76d398aea0c957c9102fc
2020-06-12 19:28:16 +00:00
govenliu
688946b7af [Wi-Fi] Add WifiNetworkDetailsFragment2 unit test cases
Add new unit test file: WifiNetworkDetailsFragment2Test.java

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiNetworkDetailsFragment2Test
Change-Id: I41d8a6b2c645ec5ca88dc2e1f894be0ac8887555
2020-06-12 19:38:46 +08:00
markchien
257b9bcdfa Remove schedule recheck logic from TetherService
This change just remove unused code.
Tethering no longer ask TetherService to schedule recheck
(use #EXTRA_SET_ALARM) from Android Q. Intead Tethering
(EntitlementManager) would schedule the recheck by itself.

This change is necessary in order to move the resourcesout
of the framework because TetherService needs to know when
it need to re-run entitlement recheck from framework res
(config_mobile_hotspot_provision_check_period).

Bug: 146918263
Test: atest TetherSerivceTest
Change-Id: Ie45859c19b96d0689c45dd610501fae0506742ff
2020-06-11 23:28:49 +08:00
TreeHugger Robot
1f21573f01 Merge "[Wi-Fi] Enhance WifiNoInternetDialogTest unit test cases" 2020-06-01 07:05:54 +00:00
govenliu
ae6628bd02 [Wi-Fi] Enhance NetworkRequestDialogActivityTest unit test cases
Add new unit test cases in NetworkRequestDialogActivityTest.java

The coverage rate of NetworkRequestDialogActivity will raise from 48% to 91%

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkRequestDialogActivityTest
Change-Id: I6530815ded8d21d01d5da1d7ee5f38ef190d3863
2020-06-01 10:58:11 +08:00
govenliu
90d72813cd [Wi-Fi] Enhance WifiNoInternetDialogTest unit test cases
Add new unit test cases in WifiNoInternetDialogTest.java

The coverage rate of WifiNoInternetDialog will raise from 10% to 95%

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiNoInternetDialogTest
Change-Id: I8256c0adebee9a7f557b467a6ea11cad09e02b33
2020-05-29 14:53:14 +08:00
TreeHugger Robot
05cc1e7076 Merge "[Wi-Fi] Remove all files in com.android.settings.wifi.savedaccesspoints" 2020-05-19 07:56:37 +00:00
TreeHugger Robot
739416db8e Merge "[Wi-Fi] Enhance AddAppNetworksFragment unit test cases" 2020-05-19 05:01:01 +00:00
Arc Wang
8c1c52f134 Merge "[Wi-Fi] Replace WifiTracker with WifiPickerTracker in WifiSettings" 2020-05-18 05:58:33 +00:00
TreeHugger Robot
76215df1df Merge "[Wi-Fi] Quit worker thread in WifiNetworkListFragment" 2020-05-15 20:11:05 +00:00
govenliu
23d91663f6 [Wi-Fi] Enhance AddAppNetworksFragment unit test cases
Add new unit test cases in AddAppNetworksFragmentTest.java

The coverage rate of com.android.settings.wifi.addappnetworks will raise from 65% to 81%

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest
Change-Id: Iae15b5ad27b20f90cbf8b0318a24a9069b738a33
2020-05-15 16:05:45 +08:00
Arc Wang
fa128687ae [Wi-Fi] Quit worker thread in WifiNetworkListFragment
Should quit worker thread when a fragment is about to
be destroyed.

Bug: 145100890
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiNetworkListFragmentTest
Change-Id: I840750ac4e9601fe553ce219305876581bea7197
2020-05-15 11:17:20 +08:00
Arc Wang
59e6bcbfdf [Wi-Fi] Remove all files in com.android.settings.wifi.savedaccesspoints
Developers should developer the files of
com.android.settings.wifi.savedaccesspoints2 with WifiTrackerLib objects.

Bug: 152571756
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.savedaccesspoints2
Change-Id: I6c8548fb7b3c9403ad300da0024e93e0e0cb8607
2020-05-15 10:32:39 +08:00
Arc Wang
41f23de712 [Wi-Fi] Replace WifiTracker with WifiPickerTracker in WifiSettings
WifiSettings uses WifiTracker in SettingsLib while WifiSettings2
uses WifiPickerTracker in WifiSettingsLib.

1. Remove WifiSettings.
2. Rename WifiSettings2 to WifiSettings.
3. Remove the files only used in the removed WifiSettings.
   (Saved networks files are not included)

Bug: 152571756
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
      atest WifiSettingsUiTest
Change-Id: I800b434c8049121db115cff87d51e164e4529999
2020-05-14 21:24:57 +08:00
TreeHugger Robot
35f12752a6 Merge "[Wi-Fi] Enhance savedaccesspoints2 unit test cases" 2020-05-14 12:00:40 +00:00
govenliu
a2eae40a79 [Wi-Fi] Enhance savedaccesspoints2 unit test cases
Add new unit test cases in
1. SavedAccessPointsPreferenceController2Test.java
2. SavedAccessPointsWifiSettings2Test.java
3. SubscribedAccessPointsPreferenceController2Test.java

The coverage rate of com.android.settings.wifi.savedaccesspoints2 will raise from 32% to 85%

Bug: 151696220
Test: Run following test commands
1. make RunSettingsRoboTests ROBOTEST_FILTER=SavedAccessPointsPreferenceController2Test
2. make RunSettingsRoboTests ROBOTEST_FILTER=SavedAccessPointsWifiSettings2Test
3. make RunSettingsRoboTests ROBOTEST_FILTER=SubscribedAccessPointsPreferenceController2Test

Change-Id: I43e43c95019659d507ae0d8b167c5d65cd036b95
2020-05-14 16:35:26 +08:00
TreeHugger Robot
1a3059c01a Merge "[Wi-Fi] Quit worker thread of WifiPickerTracker" into rvc-dev am: 02b7b16c93 am: 9fc28c5a7f am: 6cb294d26d am: d739d688b0
Change-Id: Iaee7c93686077fc0236a8c43bc34ef5f16638324
2020-05-13 05:29:33 +00:00
TreeHugger Robot
02b7b16c93 Merge "[Wi-Fi] Quit worker thread of WifiPickerTracker" into rvc-dev 2020-05-13 04:18:18 +00:00
Arc Wang
a52782bc06 [Wi-Fi] Quit worker thread of WifiPickerTracker
Should quit worker thread when a fragment is about to
be destroyed.

Bug: 152454787
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest
Change-Id: I809511b7f7c092cf9787e8f6bb7c7513c27c98c8
2020-05-13 10:34:51 +08:00
changbetty
0383d76a5e Add setPackage for PendingIntent in SliceHelper
Bug: 151645867
Bug: 151646375
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingSliceHelperTest
      make RunSettingsRoboTests ROBOTEST_FILTER=Enhanced4gLteSliceHelperTest
Change-Id: I33c1333f9b5472cdb962b272f6be52a2d2959376
Merged-In: I33c1333f9b5472cdb962b272f6be52a2d2959376
2020-05-12 17:56:48 +08:00
Betty Chang
4f8129034f Merge "Add setPackage for PendingIntent in SliceHelper" 2020-05-12 04:13:15 +00:00
changbetty
e231e87e80 Add setPackage for PendingIntent in SliceHelper
Bug: 151645867
Bug: 151646375
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingSliceHelperTest
      make RunSettingsRoboTests ROBOTEST_FILTER=Enhanced4gLteSliceHelperTest
Change-Id: I33c1333f9b5472cdb962b272f6be52a2d2959376
2020-05-08 17:28:45 +08:00
Arc Wang
ecf20ef23f Merge "[Wi-Fi] Apply WifiTrackerLib objects in wifi/dpp/WifiNetworkListFragment" 2020-05-08 01:02:44 +00:00
Arc Wang
e46081819d [Wi-Fi] Apply WifiTrackerLib objects in wifi/dpp/WifiNetworkListFragment
Bug: 152571756
Bug: 145100890
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiNetworkListFragmentTest
Change-Id: I2136b452da4a3008f493c46c8ed14b311cfc9fdd
2020-05-07 22:36:41 +08:00
TreeHugger Robot
d3db94ab0e Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: ee755aa059 am: e2db16a44d am: e3ac2ebb4c
Change-Id: Id3cdd5772a23470f506a790f1e2cc264f4ee7f1d
2020-05-07 08:44:32 +00:00
govenliu
1e0d40f2bd [Wi-Fi] Enhance Wifi Settings unit test cases.
Add new unit test cases in
1. WifiP2pSettingsTest.java
2. WifiConfigController2Test.java
3. WifiP2PPreferenceControllerTest.java
4. WifiP2pPeerTest.java

the coverage rate of
1. com.android.settings.wifi will raise from 44% to 45%
2. com.android.settings.wifi.P2p will raise from 69% to 85%

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pPeerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2PPreferenceControllerTest
Change-Id: I365494e1654376b23b08f18b1a799ffc59323a4c
2020-05-07 12:13:02 +08:00
Arc Wang
4fb48d5d19 Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 9aff7f5d0f am: 40eb2f6d21 am: 4ba2bfbc72
Change-Id: Idc827915a526820fe25d3690d6036ac05c3c8a1c
2020-05-01 05:49:41 +00:00
govenliu
4d74ae2e67 [Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases.
Add new unit test cases in WifiP2pSettingsTest.java, the coverage rate will raise from 30% to 71%.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
Change-Id: I214866efae47a99e75178beca48deb398b70f9bd
2020-05-01 09:00:10 +08:00
TreeHugger Robot
628fb47526 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: 204c1bc8f5 am: 46917ef154 am: 12d2465c80
Change-Id: I414ad38d2393b995a564ac6539d07a9a1c20d3d3
2020-04-24 09:30:40 +00:00
TreeHugger Robot
0a98937baf Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev 2020-04-24 08:32:55 +00:00
TreeHugger Robot
583682bab1 Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227 am: 1bb16670c6 am: 1292188a56 am: da8749304f
Change-Id: I4d9279221e199f136dcaf6a3bf4693aa5e512c8d
2020-04-24 07:26:24 +00:00
govenliu
d59d32e106 [Wi-Fi] Add new unit test file WifiP2pSettingsTest.java.
Add new unit test file WifiP2pSettingsTest.java.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
Change-Id: I686658969a801e385a102022c6854d8bb8972d3c
2020-04-24 13:03:09 +08:00
Arc Wang
c6c4d036da [Wi-Fi] Add IMSI privacy protection warning summary
If a SIM based Wi-Fi network is not provided with IMSI
protection, Wi-Fi detail UI shows the warning summary if
the Wi-Fi network is connected.

Bug: 148283447
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSecondSummaryController2Test
      make RunSettingsRoboTests ROBOTEST_FILTER=LinkifySummaryPreferenceTest

Change-Id: I689a75d2f0a2ae6196b2ed5985b8ff141fbac8b4
2020-04-23 14:50:18 +08:00
TreeHugger Robot
6a8435f520 Merge "[Wi-Fi] Fix NetworkRequestErrorDialogFragment exception when rotation" into rvc-dev am: dccb008642 am: e75fc6dfd0 am: 01db83e657 am: cf86f89fa7
Change-Id: I5f82a3545dba7d88325e0036e68e71beb7a2f260
2020-04-13 13:54:29 +00:00