Commit Graph

112 Commits

Author SHA1 Message Date
Bonian Chen
fecfb7f5e4 Merge "Revert "[Settings] Support getSystemService(Class<T>)"" into sc-dev 2021-03-30 05:31:52 +00:00
Weng Su
79fabbc249 Merge "Fix WifiTetherPasswordPreferenceControllerTest failed" into sc-dev 2021-03-30 03:02:58 +00:00
Weng Su
ec31a6884c Merge "Fix WifiTetherSettingsTest failed" into sc-dev 2021-03-30 03:02:43 +00:00
Weng Su
cc9b424882 Merge "Fix WifiTetherSSIDPreferenceControllerTest failed" into sc-dev 2021-03-30 03:02:27 +00:00
Bonian Chen
234b698fb2 Revert "[Settings] Support getSystemService(Class<T>)"
This reverts commit d5ccde31a8.

Reason for revert: failure on test cases

Change-Id: I0a179a6ebb5ef1dec566ce6e8facd5f3b82d7c8a
2021-03-30 00:51:15 +00:00
Weng Su
416bdecfa4 Fix WifiTetherSettingsTest failed
- Use the same service name(Context.USER_SERVICE) to mock
UserManager.class

Bug: 183922231
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest

Change-Id: Ifa9f3affbb969425acea335732ce977f18f82b49
2021-03-30 04:02:24 +08:00
Weng Su
6f2379bb44 Fix WifiTetherSSIDPreferenceControllerTest failed
- Use the same service name(WifiManager.class) to mock
WifiManager.class

- Use the same service name(TetheringManager.class) to mock
TetheringManager.class

Bug: 183922071
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiTetherSSIDPreferenceControllerTest

Change-Id: I68955d83693dda787132e2a951e8d034e57090ce
2021-03-30 03:42:10 +08:00
Weng Su
8abe0dfb92 Fix WifiTetherPasswordPreferenceControllerTest failed
- Use the same service name(WifiManager.class) to mock
WifiManager.class

- Use the same service name(TetheringManager.class) to mock
TetheringManager.class

Bug: 183921878
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiTetherPasswordPreferenceControllerTest

Change-Id: Ib6ec5a806b10e73a5fefd4acf070a4ab1f69e0d7
2021-03-30 03:31:50 +08:00
Weng Su
98746308cc Fix WifiTetherFooterPreferenceControllerTest failed
- Use the same service name(WifiManager.class) to mock
WifiManager.class

- Use the same service name(TetheringManager.class) to mock
TetheringManager.class

Bug: 183921868
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherFooterPreferenceControllerTest

Change-Id: I904c463f555c3c3c2a85272505215cf993474a7a
2021-03-30 03:17:52 +08:00
Bonian Chen
d5ccde31a8 [Settings] Support getSystemService(Class<T>)
Add getSystemService(Class<T>) to align the capability with framework
part.

This is a back port from aosp/1639943, aosp/1645152 and aosp/1648047

Bug: 179640862
Test: local
Change-Id: I035db55a71f94000ca35f8d71f03c19208423c73
2021-03-24 00:59:46 +08:00
TreeHugger Robot
cb64ea60c2 Merge "Smart Router settings UI changes" into sc-dev 2021-03-18 06:43:16 +00:00
Janis Danisevskis
5cef487b4b resolve merge conflicts of d42d9a41f6 to sc-dev
Change-Id: Ifa6a4af09d7cd45773a8c057416ab90fac23061e
2021-03-17 19:09:29 +00:00
Weng Su
68b0057f66 Smart Router settings UI changes
- Remove "AP band" preference

- Add "Maximize Compatibility" switch preference
  - Use bridged mode API for new devices (after P21)

- Screenshot:
  https://screenshot.googleplex.com/84X9Av8gVj3idjB

Bug: 168052744
Test: manual test
atest WifiTetherMaximizeCompatibilityPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest

Change-Id: Ib74156c0fa6eccdd13239854047b1fb4e49a293c
2021-03-16 21:50:55 +08:00
Bonian Chen
203f0fe89d [Settings] Code refactor - remove unused import lines
Remove some unused import lines within source code based on
https://source.android.com/setup/contribute/code-style

Bug: 182867979
Test: build pass
Change-Id: I76dbcfa9e5b435b2838401dfee15b12f472d07d0
2021-03-16 10:24:24 +00:00
paulhu
6151c227e0 Replace ConnectivityManager hidden symbols on Settings
Connectivity is becoming a mainline module in S, so
ConnectivityManager hidden symbols can not be used for outside
components. Besides, most Tethering relevant methods or variables
on CM are migrated to TetheringManager. So replace all these
methods or variables from ConnectivityManager to TetheringManager
on Settings.

Bug: 180693313
Test: make RunSettingsRoboTests ROBOTEST_FILTER=<Modified Test>
Change-Id: Iba4b121a4ddf3f04252aa0355e0e6494a593682a
2021-02-24 06:17:17 +00:00
paulhu
c11ac84929 Replace ConnectivityManager hidden symbols on Settings
Connectivity is becoming a mainline module in S, so
ConnectivityManager hidden symbols can not be used for outside
components. Besides, most Tethering relevant methods or variables
on CM are migrated to TetheringManager. So replace all these
methods or variables from ConnectivityManager to TetheringManager
on Settings.

Bug: 180693313
Test: make RunSettingsRoboTests ROBOTEST_FILTER=<Modified Test>
Change-Id: Iba4b121a4ddf3f04252aa0355e0e6494a593682a
Merged-In: Iba4b121a4ddf3f04252aa0355e0e6494a593682a
2021-02-24 11:45:02 +08:00
Stanley Wang
b87ddba6cd Use SettingsLib's MainSwitchBar to replace SwitchBar in Settings.
To log Settings metrics, the MainSwitch extends MainSwitchBar and
replace the SwitchBar in SettingsActivity.

Bug: 175181773
Test: Run robotest and apply the widget in Settings and see the ui

Change-Id: I3add3702e9058ad9192b5172c7cf0e2ccfb55a70
2021-01-14 22:48:31 +08:00
Weng Su
b9c865b704 Add Hotspot WPA3 Settings
- Add WPA3 SAE security types
  - "WPA3-Personal"
  - "WPA2/WPA3-Personal"

- Verify valid WPA3 password

- Enable QR code scanner for Hotspot WPA3

- Avoid null point exception when settings keyword searching

- Screenshot
  https://screenshot.googleplex.com/B6u54wh8w35Xnyf
  https://screenshot.googleplex.com/8hWHHUTb6UaS9vB

Bug: 167968488
Test: manual test
- atest WifiTetherSecurityPreferenceControllerTest
- atest WifiUtilsTest

Change-Id: I2992040498f8add107a4cce70a92c1c6ee6ab805
2021-01-10 08:38:39 +00:00
bsears
598ab32345 Revert "Add Hotspot WPA3 Settings"
This reverts commit e0062af10c.

Reason for revert: Bug 176569060 - Droidfood blocking crash in Settings app.

Change-Id: Id50c96e8ce704b19e5ffb9b9a9fcbb0db2d81aee
2020-12-31 21:16:51 +00:00
Weng Su
e0062af10c Add Hotspot WPA3 Settings
- Add WPA3 SAE security types
  - "WPA3-Personal"
  - "WPA2/WPA3-Personal"

- Verify valid WPA3 password

- Enable QR code scanner for Hotspot WPA3

- Screenshot
  https://screenshot.googleplex.com/B6u54wh8w35Xnyf
  https://screenshot.googleplex.com/8hWHHUTb6UaS9vB

Bug: 167968488
Test:
- Manual Test
- atest WifiTetherSecurityPreferenceControllerTest
- atest WifiUtilsTest

Change-Id: I155ed0bfd187d27ba864f9fb1b78d08c437740f3
2020-12-29 08:04:10 +00: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
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
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
778f3de13f Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712 am: 0dcef519de am: 525a986b38 am: b7ce9d8e3b
Change-Id: Ib260e880248afc3086468b752eddcf9fee951e3a
2020-03-26 06:08:24 +00:00
Arc Wang
249f629b22 [Wi-Fi] Remove @Ignore unit tests
Remove @Ignore in these objects:

  ConfigureWifiSettingsTest
  TetherServiceTest.java
  WifiTetherSecurityPreferenceControllerTest.java
  WifiSettings2Test

Bug: 151696220
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I19bdc251d76161218454c1b5f58421efab33cec0
2020-03-26 11:18:27 +08:00
Arc Wang
31f04d1585 [Wi-Fi] Fix Wi-Fi broken tests
Bug: 150910070
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ie9b9384610857e2999fe4642a93c2d31ce3315f3
Merged-In: Ie9b9384610857e2999fe4642a93c2d31ce3315f3
2020-03-20 14:07:13 +00:00
Arc Wang
4fafe6716c [Wi-Fi] Fix Wi-Fi broken tests
Bug: 150910070
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ie9b9384610857e2999fe4642a93c2d31ce3315f3
2020-03-20 15:41:29 +08:00
Automerger Merge Worker
8eb45c004d Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538 am: ec6828f05e am: 841b980a88 am: a9027be3b0
Change-Id: I3db1900bc659a06796695ebc7f2c1a8460d06c94
2020-03-12 23:32:35 +00:00
Zhen Zhang
0ad0a50538 Merge "Log some actions for changing wifi hotspot config" into rvc-dev 2020-03-12 19:47:42 +00:00
Zhen Zhang
63c7c202d7 Log some actions for changing wifi hotspot config
Log following actions:
- wifi hotspot name changed
- wifi hotspot password changed

Added tests for logging actions in each controller's test.

Bug: 151113705
Test: WifiTetherSSIDPrefereceControllerTest;
WifiTetherPasswordPreferenceControllerTest;
CodeInspectionTest

Change-Id: I84b1cd8449e575a6ee1ad8868e7791dc601e726f
2020-03-12 01:06:46 -07:00
Automerger Merge Worker
b73276489c Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: 93fedb0e3f am: 9bd2280297 am: 1c9951fde6
Change-Id: Ie4c08847d5073c54b71827ed7f8cc19428628a3c
2020-03-12 03:49:06 +00:00
TreeHugger Robot
f2639347e3 Merge "Fix and Ignore broken test cases" 2020-03-11 12:39:44 +00:00
Yi-Ling Chuang
b8eb466dd1 Fix WifiTetherSettingsTest
Bug: 151201888
Test: run WifiTetherSettingsTest successfully
Change-Id: I80df83f3dc720c80734ec083c33bab5c56c52796
2020-03-11 19:33:09 +08:00
Tsung-Mao Fang
72b780aa89 Fix and Ignore broken test cases
Test: Run Test
Bug: 150914062
Bug: 151201888
Bug: 150907639
Change-Id: I7f467aebbbe35cb20d5c42b1db04e2838c12cfbb
2020-03-11 18:39:21 +08:00
Arc Wang
b8fb854e98 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev 2020-03-11 04:00:49 +00:00
Arc Wang
005fe6951c [Wi-Fi] Add STA+AP information in Hotspot & tethering footer
Use WifiManager#isStaApConcurrencySupported() to check if a
device supports STA+AP and shows the footer information.

Bug: 121328949
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TetherSettingsTest
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherFooterPreferenceControllerTest
Change-Id: I3446abb5cc9cdf76da8d17f5de31bd65715c165c
2020-03-10 18:15:13 +08:00
Arc Wang
ac5e1acfba [Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled
In the current Settings framework onSwitchToggled has been implemented
to monitor the change in Settings done by user but its getting called
even when Settings is changed using setChecked where under certain
condition like rotation during config changed,
Tether Settings is disabled and then enabled and later before Rotation
Settings remained false due to stop Tethering with Tether Enabled
After Rotation when settings is initialized it is set as disabled
and even after receiving the Tether Enabled it remains Off.
Hence used onClick to monitor user ON/OFF Settings

Bug: 142625203
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSwitchBarControllerTest.java
Test: Manual
1. Go to Wifi Hotspot Settings
2. Turn ON
3. Change SSID and save
4. Rotate screen soon after saving
Result: Hotspot does not turn ON, remains in OFF state.
Signed-off-by:JeiFeng Lee <linger.lee@mediatek.com>

Change-Id: Ibddacdf35eb3196f40cdb2c240efa902f9123646
2020-03-05 18:21:39 +08:00
Roshan Pius
a023de72a9 Settings: Use new API for tethering auto shutdown
Bug: 148514485
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=
com.android.settings.wifi.tether.WifiTetherAutoOffPreferenceControllerTest
Test: Manually verified the toggle from Settings.
Change-Id: I5f89c6149b9f2e7145ecb1cf656adb3d3e8f1bff
2020-02-18 07:27:43 -08:00
lesl
df450cc9f6 tether setting: fix test error: updateDisplay_shouldUpdateValue
ag/10257734 change band convert to general design.
Fix test to match new design

Bug: 149251992
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CodeInspectionTest
Change-Id: I6f09d9d4f440515fb51a237d966327e232fe5928
2020-02-11 11:18:21 +08:00
lesl
561d041f7b tether setting: Remove dual mode check for band convert
Some conutries don't support 5G only hotspot. Thus band convert should
not only work for dual mode device. It should general design since it
will be country dependency.

Bug: 148924644
Bug: 148764406
Test: Manual Test, use command to force country
1. adb root && adb shell cmd wifi force-country-code enabled GB
2. Change Band Setting to 5G prefer

Turn on hotspot to check log and make sure it will enable succeed.
Test:make RunSettingsRoboTests ROBOTEST_FILTER=CodeInspectionTest

Change-Id: I7828c62ef399244531a72aa35c89b71549e0d623
2020-02-06 09:49:41 +00:00
David Su
8ab62a8750 Migrate WifiManager.isDualModeSupported() to isStaApConcurrencySupported()
isDualModeSupported is being removed, replace it
with isStaApConcurrencySupported.

Bug: 144925765
Test: compiles
Change-Id: Ia3a0417a154ea401579a039113e96ba4578ffd80
2020-01-29 14:46:33 -08:00
TreeHugger Robot
c824ef4940 Merge "softap: Use set/getPassphrase to replace set/getWpa2Passphrase" 2020-01-10 08:47:44 +00:00
Lee Chou
30c453755e Disable Broken Settings Tests
Some Settings Tests are currently broken, disabling for now

Bug: 147464840
Test: make RunRoboSettingsTests
Change-Id: I7c00faa00ce91030e76b7d4d028f6a30e471738f
2020-01-10 16:16:17 +08:00
lesl
24a505c4eb softap: Use set/getPassphrase to replace set/getWpa2Passphrase
Bug: 142752869
Test: Manual, on/off/setting change for hotspot function
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CodeInspectionTest
Change-Id: I22c89f15a6ef1c5366394431cc5aa7031a573d45
2020-01-09 19:23:41 +08:00
Stanley Wang
c3abeb3c99 Remove the @ignore flag in test file.
- Remove the @ignore flag in WifiTetherApBandPreferenceControllerTest.
  All test cases should pass.

Fixes: 147031384
Test: robotest
Change-Id: Icf7d5063b001699c644d6666c79b6e81709d704d
2019-12-31 18:15:23 +08:00
Ahmed ElArabawy
2632c25f37 Wifi: Fix rototests for wifi tethering
This commit makes fixes to the wifi tethering rototests.
These fixes are done by using the proper encoding for the AP bands.

Bug: 146767071
Test: Run robotest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I4ddf6ea9328dabed09bc23d355efa188975316b6
2019-12-30 22:55:17 -08:00
Jason Chiu
009b1896cd Ignore failed test cases
Bug: 146767071
Bug: 146767072
Bug: 146771294
Test: make RunSettingsRoboTests -j

Change-Id: I588fb5ef00320c5181102d8312d7fb8e78778662
2019-12-23 17:44:18 +08:00
Ahmed ElArabawy
ead637e0c8 Wifi: Replace dual_band with 5GHz band support
As part of the support of the 6GHz band, the concept of dual-band is no
longer valid since we have more than 2 bands supported by Android and
can be checked on the device.

This commit replaces checks on dual-band support with an explicit check
on 5GHz band support.

Bug: 145936758
Bug: 139354972
Test: Manual
Change-Id: Ia118dedb573f61a148764146edf8091ae253a3e2
2019-12-12 16:36:23 -08:00
lesl
ff012f03a8 Wifi Setting: Use SoftApConfiguration for Tether Setting
Bug: 145578449
Test: Manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CodeInspectionTest
Change-Id: I02b4dcbb7b6e29b67ecc7356200f3fc3a1007562
2019-12-05 17:28:24 +08:00
govenliu
6ee894759a [Wi-Fi HotSpot] Improve Wi-Fi hotspot settings entries visibility problem
When the security type of hotspot changed, the hidden item will showed because of the Expanded child list is set as constant.

To improve it, dynamicall adjust the Expanded child count according to the security type.

Bug: 138594907
Test: Manually
      1. Enter Settings APP -> Network & internet -> Hotspot & tethering
      ->Wi-Fi hotspot
      2. Check if there are only two expanded items if the
      Security type is None, or three expaned items if the Security type
      is WPA2-personal
      3. Change the Security type and back to check item 2 match or not.

Change-Id: I84d1c5dca94d6a218cfc7ecd57e201e1cffdd878
2019-08-15 19:07:22 +08:00