Commit Graph

84 Commits

Author SHA1 Message Date
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
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
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
Yi-Ling Chuang
b8eb466dd1 Fix WifiTetherSettingsTest
Bug: 151201888
Test: run WifiTetherSettingsTest successfully
Change-Id: I80df83f3dc720c80734ec083c33bab5c56c52796
2020-03-11 19:33:09 +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
Sunny Shao
5da24591ea Update testcases which failed due to the SupportLibrary changed
Fragment.oncreate() causes an IllegalStateException. We use a
ShadowFragment to stop the calling sequence.

Fixes: 135086559
Test: robotest
Change-Id: I601e0f2513f826b0b7749cb2c013b7e4c0a94a33
2019-06-13 10:02:50 +00:00
Salvador Martinez
f087a4cf60 Merge "Remove airplane mode restriction on hotspot" 2019-03-12 18:27:36 +00:00
Salvador Martinez
b94251ad07 Remove airplane mode restriction on hotspot
This isn't needed anymore since we support this now.

Test: robotests
Bug: 111681176
Change-Id: I0292f0a38347e4fa3414170e0351a53f5997a192
2019-03-08 16:34:57 -08:00
Arc Wang
b249fb7d13 Support to share Wi-Fi hotspot via QR code
1. QR code scanner (Wi-Fi Easy Connect) does not support sharing Wi-Fi hotspot
   at current stage
2. Wi-Fi hotspot QR code button only shows when Wi-Fi hotspot is enabled
3. The QR code has the security string "WPA" for hotspot's WPA2_PSK

Bug: 123151660
Test: atest WifiTetherSSIDPreferenceControllerTest
            WifiQrCodeTest WifiDppConfiguratorActivityTest
            WifiDppEnrolleeActivityTest
            WifiDppQrCodeGeneratorFragmentTest
            WifiDppQrCodeScannerFragmentTest
            WifiNetworkListFragmentTest
            WifiDppChooseSavedWifiNetworkFragmentTest

Change-Id: I2e89450180b82cc841ee3b15be52bfc6f9f6164d
2019-03-08 11:48:12 +08:00
jackqdyulei
5ca4e06dfe Add lost prefController to WifiTetherSettings
One controller is lost during a refactor(ag/4774003), this CL adds
it back.

Change-Id: Ie50a3ac009f302d4fd7a179117fe026031cc1ae8
Fixes: 122235175
Test: RunSettingsRoboTests
2019-01-02 11:30:03 -08:00
James Lemieux
f1dade40d2 Use binary resource support in robolectric
The resources available to tests are now exactly the merged resources
located in the APK under test.

Bug: 74359828
Test: make -j56 RunSettingsRoboTests
Change-Id: I050db81a92decefea23314b5ec7a62f77ff4bb2b
2018-12-12 19:53:49 -08:00
Hai Shalom
1638168336 [WPA3] Filter unsupported networks from Add network spinner
Filter unsupported networks from Add network spinner. Removed entries
from wifi_dialog.xml, adding them dynamically based on device
capabilities. Adding position-to-security table, that decouples spinner
positions from security values.

Bug: 112195778
Test: atest WifiConfigControllerTest + device functional test
Change-Id: I6a814c4d69fbd8d8076db5dbaa5da807b4da4c32
2018-11-21 18:58:38 -08:00
Doris Ling
9f1c617016 Disable toggling wifi tethering in secondary user.
- in previous release, the shortcut widget was for the top level
Hotspot & Tethering settings page. The top level settings has logic to
check whether the page is restricted and remove all preferences and
show a message to tell the user that tethering settings are not
available, and the user will not be able to launch the wifi hotspot
settings page.
- the updated shortcut now launches the wifi hotspot page directly.
The settings does not check for restriction. Copy the logic from the top
level settings to check for restriction and remove all preferences
accordingly.

Change-Id: I76fb7838e2db379f6ffbce7bf14003bccc1b10d3
Fixes: 116642428
Test: make RunSettingsRoboTests
2018-11-16 15:05:22 -08:00
Hai Shalom
f2f00313bb packages/apps/Settings: Add logic and strings to support WPA3 and OWE
Add and update Wi-Fi security strings, and add logic to enable WPA3
and OWE. Modified WPA2-PSK to WPA2-Personal, and added WPA3-Personal,
Enhanced Open and WPA3-Enterprise.

Bug: 112195778
Test: Basic functional tests
Change-Id: Ia97761a7f0a9e2fee768dfaf3578a2f1090d29c6
2018-11-05 16:40:07 -08:00
Fan Zhang
23f8d59d02 Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00
jackqdyulei
f5aa59e99e Implement createPrefControllers for tether page
So tether preferences could show up in search

Change-Id: I234680aff878451df2a634cb58538bb2627d2eff
Fixes: 112599941
Test: Robotests
2018-08-15 13:15:04 -07:00
Salvador Martinez
3ba12d0086 Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev am: 4804c2c7a5
am: 94bebd2f80

Change-Id: Ia5274cd69ce2d6208cf9490b7a41ec080090cb6f
2018-07-10 12:46:09 -07:00
Salvador Martinez
78c3f368c3 Fix incorrect method call to wifiManager in Tether
In the WifiTetherApBandController the incorrect method was
being called to check if the device is 5Ghz compatible. We
were calling is5GhzBandSupported directly, but we were
supposed to call isDualBandSupported instead.

Test: robotests updated
Bug: 110793581
Change-Id: I61d3ff10abedde6196b8e29591ebfd3272dbbcd9
2018-07-09 11:52:34 -07:00
Fan Zhang
c7162cd24d Reorder and clean up imports.
Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68
2018-06-18 15:45:09 -07:00
Salvador Martinez
acff57fa68 Change UI for wireless AP tether band selection
We decided to use the list preference after all due to
some devices not supporting various combinations of AP
configurations. This change makes it so that there are
three different UIs depending on the configurations
which are supported.
- 5.0 GHz unsupported: disable the preference and just
set the value to 2.4 GHz
- all supported, no dual mode: allow the user to choose
EITHER 2.4 GHz or 5.0 GHz
- all supported, dual mode: allow the user to choose
2.4 GHz or BOTH 2.4 GHz & 5.0 GHz with 5.0 being
preferred

Test: atest SettingsRoboTests
Bug: 80315296
Change-Id: I888d35811a98b8cf0155a3cb96c42ff762763378
Merged-In: I888d35811a98b8cf0155a3cb96c42ff762763378
2018-06-12 22:59:28 +00:00
Salvador Martinez
e83388164c Change UI for wireless AP tether band selection
We decided to use the list preference after all due to
some devices not supporting various combinations of AP
configurations. This change makes it so that there are
three different UIs depending on the configurations
which are supported.
- 5.0 GHz unsupported: disable the preference and just
set the value to 2.4 GHz
- all supported, no dual mode: allow the user to choose
EITHER 2.4 GHz or 5.0 GHz
- all supported, dual mode: allow the user to choose
2.4 GHz or BOTH 2.4 GHz & 5.0 GHz with 5.0 being
preferred

Test: atest SettingsRoboTests
Bug: 80315296
Change-Id: I888d35811a98b8cf0155a3cb96c42ff762763378
2018-06-06 13:09:41 -07:00
TreeHugger Robot
0e721c598e Merge "Make user explicitly set security type for tether network" into pi-dev 2018-05-19 03:17:17 +00:00
Salvador Martinez
d9bae5a15e Make user explicitly set security type for tether network
This was made implicit which is confusing for the user so this CL
adds a preference to make the user manually choose their security
type.

Test: robotests
Fixes: 79435112
Change-Id: Ie78806e8952b52e1b7cd21f0b87c9d064acaff64
Merged-In: Ie78806e8952b52e1b7cd21f0b87c9d064acaff64
2018-05-19 02:14:18 +00:00
Salvador Martinez
f3d532f43d Make user explicitly set security type for tether network
This was made implicit which is confusing for the user so this CL
adds a preference to make the user manually choose their security
type.

Test: robotests
Bug: 79435112
Change-Id: Ie78806e8952b52e1b7cd21f0b87c9d064acaff64
2018-05-18 15:21:07 -07:00
Lei Yu
c81da687a0 Merge "Fix tethering summary when airplane mode is off" into pi-dev am: a07b1f83a8
am: 8ed6b5dabf

Change-Id: I27bd8d85f0c22207336f8bf632280a5bfd243658
2018-05-17 19:21:49 -07:00
Lei Yu
4fec12cbbf Fix tethering summary when airplane mode is off
When airplane mode is off, fall back to default summary
(tether off summary). It should be fine because once tether
state get updated again, it will go through original listener
to update the summary.

Change-Id: Iba9b56f452e72365ea964d841ee156a2625c0ae1
Fixes: 79721162
Test: RunSettingsRoboTests
2018-05-17 14:38:22 -07:00
Chilun
d3358d8a6f Add index for Hotspot settings page into search
Added index provider into TetherSettings and WifiTetherSettings pages.
Added robotests to check the keys returned by getNonIndexableKeys.
Move repeated code into utility class.

Bug: 74777873
Test: make -j RunSettingsRoboTests
Test: atest UniquePreferenceTest
Change-Id: I6cb09d735afa4867d25a79de733ce8c59634e49b
2018-05-09 14:05:15 +08:00
Salvador Martinez
60c513d908 Merge "Only start tether when not already enabled" into pi-dev am: f62f91b0b6
am: 964d107491

Change-Id: I0d325498e2ea8526fbc4e6ec4bf579331bf0848b
2018-04-26 14:30:25 -07:00
Salvador Martinez
a4fe5c9871 Only start tether when not already enabled
The toggle in the tether page currently tries to start tethering if
it gets turned on. However, changing a wifi config can cause
startTether to be called and also the toggle to switch leading to
a double call to startTether. This CL makes it so that if we are
already connected to tethering we don't try to start it again.

Test: robotests
Change-Id: I91085244c5d1fcc245a6b6480e638a32bc14f0ac
Fixes: 78028548
Fixes: 78441216
Fixes: 74368363
2018-04-26 10:14:54 -07:00
Aurimas Liutikas
e0069d332d Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
2018-04-20 12:52:29 -07:00
TreeHugger Robot
96d4cd3c61 Merge "Make WifiTether listen to datasaver" into pi-dev 2018-04-20 02:57:04 +00:00
Salvador Martinez
7ba65c39ae Make WifiTether listen to datasaver
Wifi Tethering is already turned off when appropriate. However
if you re-enable it you still can't toggle the tether switchbar.
This CL makes it so that if you disable data saver the toggle
becomes enabled again.

Test: robotests
Bug: 77860936
Change-Id: I03fa74c21674678a90cde7bd20fa68167f02ae3c
2018-04-20 02:56:47 +00:00
Salvador Martinez
10ba9c1786 Update Wifi Tether band selection UI
This CL updates the preference for selecting the enabled tether bands
to allow individual selection of multiple bands instead of forcing
a single selection. Note that while this makes the UI theoretically
support new bands in the future, the wifi backend only supports
selecting a single band or all bands which this CL does not address.

Test: robotests
Bug: 73102003
Change-Id: Ib2d4a2834c5cd11875515d308f7b20bfc8471959
2018-04-19 13:37:09 -07:00