Commit Graph

654 Commits

Author SHA1 Message Date
Arc Wang
76740afba2 Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f am: 45aa81bc52 am: 1beb4afce7 am: 2dba198a1b
Change-Id: I65cd00ac3768263d283b7691f1e392eaebeff66b
2020-03-26 04:03:32 +00:00
Arc Wang
b3c16d5d4f Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev 2020-03-26 03:07:33 +00:00
Arc Wang
aa05461b9c [Wi-Fi] Fix unit test ssidPref_isSubscription_show
Only setSummary for mSsidPref when the SSID is not null

Bug: 152375927
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Ia39f01e6bdb7b1b531a6b07610e061a98140dda4
2020-03-25 23:48:07 +08:00
TreeHugger Robot
ff9e7720ea Merge "[Wi-Fi] Fix check mark button when edit the password of a secured network." into rvc-dev am: a802eba9b8 am: 202e028212 am: 42b9886a66 am: b794d5969c
Change-Id: If04a12f9f5aa1f3bf469dfddc9abaacd6f82160a
2020-03-25 12:02:18 +00:00
TreeHugger Robot
a802eba9b8 Merge "[Wi-Fi] Fix check mark button when edit the password of a secured network." into rvc-dev 2020-03-25 10:56:22 +00:00
Arc Wang
b011c5bf82 [Wi-Fi] Fix check mark button when edit the password of a secured network.
Should handle WifiConfigUiBase#dispatchSubmit() for check mark button events.

Bug: 152144169
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiEntryFragmentTest
      make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureAccessPointFragmentTest
Change-Id: I35cbc1cdd6fbef3fd51aaa8dec94722e4155b7f4
2020-03-25 17:14:28 +08:00
Arc Wang
766e874428 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766 am: e446e42d63 am: 660cacfa0d am: 787f8a7635
Change-Id: I394d039cd49428709ce3405d4461bc4c71c7b3b5
2020-03-24 08:28:45 +00:00
Arc Wang
e4b0989766 Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev
* changes:
  [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - II
  [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - I
2020-03-24 07:25:17 +00:00
Arc Wang
fafcd3b362 [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - II
Some tests are removed because WifiTracerLib listens to most intents
and callbacks to Settings APP, most of the receiving intent tests are
removed.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Ie726938b7c6e94bbaf6479f6a8797a92d869ba8c
2020-03-23 16:21:07 +08:00
TreeHugger Robot
c24801b26b Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: d582019b63 am: 742539e288 am: 22c2b61ee2
Change-Id: Iefc7917e2fcc485fe5cdc784795b5be31f8d44aa
2020-03-23 03:34:47 +00:00
TreeHugger Robot
dea87bd85b Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev 2020-03-23 02:07:56 +00:00
Arc Wang
263930d8b4 [Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - I
Some tests are removed because WifiTracerLib listens to most intents
and callbacks to Settings APP, most of the receiving intent tests are
removed.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Id88a5c9276457e329840e72711bd06e51a03dd1f
2020-03-23 09:42:35 +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
04854f8234 [Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings
When WifiTracker2 callbacks to Wi-Fi Settings, should check if the
activity is finishing at first.

Bug: 151677440
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiSettings2Test
Change-Id: I95737eae3f67e6471c75ba845b57af2d721d5d37
2020-03-20 18:02:02 +08:00
TreeHugger Robot
c2e24ebb2b Merge "[Wi-Fi] Fix Wi-Fi broken tests" 2020-03-20 08:53:54 +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
Goven Liu
22d36871c0 Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 am: a3e9660230 am: 1db751a1d3 am: 8450e47487
Change-Id: Ic6ccbc9086d500da823282234f2fcc845c8ff4ac
2020-03-20 05:30:09 +00:00
govenliu
907e402cfa [Wi-Fi] Add API to handle help button click event
Add API to launch help page when Openroaming help button is tapped.

Bug: 146669261
Test: Add openSubscriptionHelpPage_shouldCallStartActivityForResult unit test to check StartActivityForResult had been launched correctly.
Change-Id: If18248e7d985215e65dfdc5742cd9007efbbff1a
2020-03-19 23:22:36 +00:00
Varun Anand
61d26322b3 Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3 am: 742cec9ad4 am: 5f0937286b am: acb2d24b80
Change-Id: I9d7c382c30de485c5530960c996775010e57c361
2020-03-19 22:05:53 +00:00
Varun Anand
4ebfaec3a3 Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev 2020-03-19 21:21:22 +00:00
Varun Anand
310ddbb79f Fix the availability of UseOpenWifiPreferenceController.
Right now, it crashes if mEnableUseWifiComponentName is disabled by the
open wifi app.

Bug: 150773571
Test: manual - along with ag/10741759, verified that disabling
mEnableUseWifiComponentName hides the toggle instead of causing crash.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=UseOpenWifiPreferenceControllerTest

Change-Id: I47e36fab411e4e4d1a23b7c91504139f124222e1
2020-03-18 19:50:50 -07:00
TreeHugger Robot
f0c9ee7e39 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 am: 5e7b076c2d am: e6e0431e66
Change-Id: Ic11e5d15f0db219d8025062d2def6ad5c98c413e
2020-03-18 06:10:40 +00:00
govenliu
26b70a9bc7 [Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest
Remove the @Ignore tag in ConfigureWifiEntryFragmentTest, and add a fake NetworkDetailsTracker to pass test.

Bug: 151696220
Test: Run make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiEntryFragmentTest
Change-Id: Icf06d27030fa2c68d3c2bee03beb583592beb599
2020-03-17 18:05:00 +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
Automerger Merge Worker
bb1deeca73 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: cb9cfc19c3 am: 570ec6a4a1 am: 99974b69db
Change-Id: I4a70e6fb297ea12873dc7b71f4bb1de3bafb703d
2020-03-11 05:08:29 +00: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
Automerger Merge Worker
e5a9590eb5 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 am: 8cab6d80f9 am: 5c9b3e86ff
Change-Id: Idfcc1a72b9c9ddd3216694209226c4104238c26d
2020-03-10 13:26:54 +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
govenliu
6794ce8233 [Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page
The startActivity API can not launch the help page.
Change to use startActivityForResult to launch.

Bug: 143784389
Test: Add learnMore_launchesHelp_shouldStartActivityForResult unit test to check if startActivityForResult be called.
Change-Id: Ia3ef82f94d4c8feb71131b44be26df74d6259805
2020-03-10 14:28:34 +08:00
Automerger Merge Worker
c4e1408a30 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: ff11b08361 am: 241f426e36 am: dcbe174ab5
Change-Id: I3a449473066ae36f13cae1f36f9a2ace98836f83
2020-03-07 23:18:44 +00:00
TreeHugger Robot
29063e3779 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev 2020-03-07 17:16:05 +00:00
Automerger Merge Worker
054b853b2d Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516 am: e47d1cae4f am: 3806ccd234 am: 3ffbb869c5
Change-Id: I3e050f140686bfab641ae41f2a85c3f557b5060e
2020-03-06 22:32:37 +00:00
Quang Luong
858cf42516 Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev 2020-03-06 21:36:30 +00:00
Arc Wang
f5e9927668 [Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon
click the gear icon will always switch to Wi-Fi detail screen.

Bug: 150911380
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedWifiEntryPreferenceTest
Change-Id: I640d180ae5684ffaa9b2adec7b1be401b2bfd89d
2020-03-06 19:27:08 +08:00
Tsung-Mao Fang
9a32a3c86c Ignore some broken tests
In order to running presubmit asap,
we ignore broken tests first.

Test: Run robotest
Bug: 150910070
Change-Id: I6c774eeef7d81b085e5dc4d8f6066b103c54c6cf
2020-03-06 12:10:47 +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
Arc Wang
d5bdbdb345 Fix exception when filtering the APPs which can CHANGE_WIFI_STATE
When filtering AppEntry, only allow the extraInfo type of WifiSettingsState.

Bug: 148486719
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppStateChangeWifiStateBridgeTest
Change-Id: I486e88629aec8cfecf6174de8987d37394043743
2020-03-04 16:09:41 +08:00
Arc Wang
9730b5aa86 [Wi-Fi] Ignore incorrect user certificates
These incorrect user certificates displayed when users
editing a Wi-Fi network of WPA3-Enterprise in 192bit.

Bug: 149763958
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest2

Change-Id: Iab35ac975933abc54fda83b99a2109d53d6722d4
2020-02-24 15:23:56 +08:00
TreeHugger Robot
394323bc51 Merge "Wifi slice improvement" 2020-02-20 12:40:06 +00:00
Jason Chiu
dd1fbd68d0 Wifi slice improvement
- always show toggle

Bug: 149666241
Test: robotest
Change-Id: I602d26abf2dfa631a939ee79e9adc63bed44ade0
2020-02-20 17:38:01 +08:00
Roshan Pius
efbfccbf4c Merge changes from topics "ap_shutdown_timeout_flag", "scan_always_available_API"
* changes:
  Settings: Use new API for setting wifi scan always on
  Settings: Use new API for tethering auto shutdown
2020-02-19 16:28:43 +00:00
govenliu
824796d3b2 [Wi-Fi] Support WiFi detail page for OpenRoaming feature in AOSP setting.
Issue: Openroaming should have a specific detail page.
Solution: Apply the mock design to only reserve two preference items:
          1.Auto-connect
          2.Scription details

Bug: 146669261
Test: Add unit test case to test the new controller: WifiSubscriptionDetailPreferenceController2
Change-Id: Iba96500062f412f4cdcd1c8248544657770ab231
2020-02-19 22:22:47 +08:00
lucaslin
4ef8ec0e4c Add capport info to WiFi details(WifiDetailPreferenceController2)
Session expiration time and venue webpage can be obtained through the
captive portal API.

Test: make RunSettingsRoboTests \
      ROBOTEST_FILTER=WifiDetailPreferenceController2Test
      (Since WifiDetailPreferenceController2Test is ignore now,
      there is no test will be run in
      WifiDetailPreferenceController2Test)
Bug: 139269711
Change-Id: I80b93689539c6ba5edafa3d0029376deca7ac1f7
2020-02-19 17:31:41 +08:00
lucaslin
9f7f0b5baf Add capport info to WiFi details
Session expiration time and venue webpage can be obtained through the
captive portal API.

Test: make RunSettingsRoboTests \
      ROBOTEST_FILTER=WifiDetailPreferenceControllerTest
Bug: 139269711
Change-Id: Ie767a9b8eb17de2c1b70928a8f3cdf4cf2a1dbd1
2020-02-19 17:31:25 +08:00