Commit Graph

904 Commits

Author SHA1 Message Date
Weng Su
6c42636cb8 Fix unexpected Wi-Fi hotspot shutdown
- Filter out unnecessary onSwitchChanged callbacks when the switch is
  disabled, which should not be triggered by user input.

- Refine the state handling function to avoid unnecessary
  onSwitchChanged callback.

- Refine the error handling of isHotspotPasswordValid function.

Bug: 227719584
Test: manual test
make RunSettingsRoboTests \
  ROBOTEST_FILTER=WifiTetherSwitchBarControllerTest

Change-Id: If62aaadc8ddb214769b1367d7801b6125bb5377c
2022-04-08 05:35:14 +08:00
Weng Su
9ed56d081c Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6 am: ec1b6c308a am: c422d95147
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236

Change-Id: I71a0799dd5561b069d587491f78957e48fa87541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 09:06:51 +00:00
Weng Su
c68e241fa6 Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" 2022-04-01 08:08:51 +00:00
Treehugger Robot
4440e7a067 Merge "Settings: Fix WifiSettings FC when rotating screen" am: f558fc27d9 am: 3531a34760 am: caa0bbd931
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1975409

Change-Id: I56e489c2867242dfc425aba6dea8896d903ab4c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 02:16:00 +00:00
Weng Su
2088b4985d WiFi restricted connection when scan QR code
- Use WifiEntry#canConnect() to determine if the network can be
  connected.

- Add WiFi network but don't connect if WiFi restricted connection.

- See the result screenshot in b/203168943#comment16

Bug: 203168938
Bug: 203168943
Test: manual test
make RunSettingsRoboTests \
  ROBOTEST_FILTER=WifiDppQrCodeScannerFragmentTest

Change-Id: I06d1e832176e540ddd1adce8da46ef8659534ab7
2022-04-01 06:04:34 +08:00
hoffc
0991b39ed3 Settings: Fix NPE FC when access saved wifi p2p device after screen rotation
Rotating screen, wifi p2p setting fragement will be re-created and the selected wifi p2p device will be saved in onSaveInstanceState. However, now this saved wifi p2p device is restored in onActivityCreated, this is too late. So when getting this saved wifi p2p device return NULL in onCreateDialog and leads to NPE force close.

Restore the saved wifi p2p device in onCreateView instead of onActivityCreated.

Bug: 220025725
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest

Change-Id: I9b746e21f7f3651c69b1445f2389c089ec19319c
2022-03-31 06:52:37 +00:00
hoffc
f3fe5cf197 Settings: Fix WifiSettings FC when rotating screen
Rotating screen will trigger wifisettings re-creation. Force close occurs If receiving wifi picker tracker callback during activity finishing.

Bug: 218411211
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettingsTest

Change-Id: I06d251a8a12d3f8785db24ead0abe31c0f34cc9b
2022-03-31 04:00:52 +00:00
TreeHugger Robot
670016a2ee Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" into tm-dev 2022-03-29 06:33:46 +00:00
TreeHugger Robot
727583b75f Merge "Fix Wi-Fi hotspot switch UI issue" into tm-dev 2022-03-25 08:40:57 +00:00
Zoey Chen
bf99e37329 [LeAudio] Remove the QrCamera and decorateView in Settings
Bug: 214340362
Test: Manual test
Change-Id: Ibc29f0e90af28e14a11164fa8940920745545c7e
2022-03-24 21:19:18 +08:00
Weng Su
b844a7a920 Fix Wi-Fi hotspot switch UI issue
- The Wi-Fi hotspot switch only handles the click event from the UI.

- Use the onSwitchChanged callback to handle click and swipe events.

Bug: 218891956
Test: manual test
make RunSettingsRoboTests \
  ROBOTEST_FILTER=WifiTetherSwitchBarControllerTest

Change-Id: Ie4136443845489be295a8ee0f3058f493a3b5829
2022-03-24 20:09:29 +08:00
Betty Chang
0ef919db7e Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" into tm-dev 2022-03-24 08:21:16 +00:00
changbetty
dacce1fae3 Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT
Bug: 214338905
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=QrCameraTest
Change-Id: I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427
2022-03-23 13:38:46 +00:00
TreeHugger Robot
a12da0a8e8 Merge "Fix adding wifi configuration issue" into tm-dev 2022-03-23 08:27:47 +00:00
Weng Su
f5cd7140f4 Fix adding wifi configuration issue
- The Wi-Fi Enterprise Restrictions add a new
  UserManager.DISALLOW_ADD_WIFI_CONFIG restriction from T.

- When a user requests to add Wi-Fi configuration, Settings will
  reject the request if the user is not allowed.

- The above restriction need to be retrieved in advance so that the
  user's request will not be rejected.

- See the result screenshot in b/224459753#comment8

Bug: 224459753
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksActivity

Change-Id: I2dfb6b9946dd9dbd4eb8bf0f6549ac5cb4466f17
2022-03-23 06:18:55 +08:00
Weng Su
98d30c880d Fix ConnectivityManager.requestNetwork crash issue when try again
- When the user requests "try again", the Network-Request-Dialog will be
  recreated. If the Wi-Fi framework sends the callback result at this
  time, the Network-Request-Dialog may not be ready at the moment,
  causing the NPE to crash.

- Add NPE checks to avoid crash issues.

Bug: 220679437
Test: manual test
make RunSettingsRoboTests \
  ROBOTEST_FILTER=NetworkRequestDialogActivityTest

Change-Id: I8e48a29649e72d9f8c67c4ac24f0eb27ba600dae
2022-03-22 18:14:22 +00:00
Weng Su
190d871520 Restrict WiFi network connection
- Use StandardWifiEntry#canConnect() to determine if the network should
  be disabled or not.

- Use StandardWifiEntry#getSummary() to retrieve the restriction message.

- Disabled WiFi network if it cannot connect.

- If WiFi network is connected or saved network, leave it enabled to
disconnect or configure.

- See the result screenshot in b/203168943#comment11

Bug: 203168938
Bug: 203168943
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=LongPressWifiEntryPreferenceTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Merged-In: I04aafaa5b383598a0f87eea15d06b38bbc662b9e
Change-Id: I04aafaa5b383598a0f87eea15d06b38bbc662b9e
(cherry picked from commit f86bdc9c69)
2022-03-08 07:06:30 +00:00
Jimmy Chen
78a0f6f98e p2p: Close the channel when onStop is called.
P2P dialog is moved to an indenpendent activity, it will push Settings
to background and trigger onPause(). As P2P dialog is a Dialog Activity,
it won't trigger onStop, but SoftAp and NAN activity will. Moving
channel closing to onStop to adapt to new P2P dialog design.

Bug: 219406778
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
      create a p2p connection between 2 devices with this build.
Change-Id: I2fab5aa1021ec1a993f811c7310079db9d7f03c0
2022-03-07 10:44:04 +08:00
TreeHugger Robot
1cdd5923f8 Merge "Mock UserManager.class for WifiSettingsTest" 2022-01-25 03:11:38 +00:00
TreeHugger Robot
544397015b Merge "Fix WifiSummaryUpdaterTest issues for registerReceiver security design" 2022-01-24 09:46:33 +00:00
Weng Su
679153be09 Mock WifiP2pManager.class for WifiP2pSettingsTest
Bug: 214938188
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest

Change-Id: I21bfc1c8303970437ae2641ed0f2f9c16f09b33f
2022-01-23 10:15:40 +00:00
Weng Su
481f696a88 Fix WifiSummaryUpdaterTest issues for registerReceiver security design
- Security team add new interface to Context.registerReceiver() with a
third parameter for new security design.

- The new interface might have some issues in the test environment.

- Spy the registerReceiver() and unregisterReceiver() to avoid
unexpected issues.

Bug: 214938188
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSummaryUpdaterTest

Change-Id: Ibd1c5c1f7b4309ad5079f33bb232f249c6bd997f
2022-01-22 14:40:34 +00:00
Weng Su
a9a1bb3747 Mock UserManager.class for WifiSettingsTest
Bug: 214938188
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettingsTest

Change-Id: I1b8faba6348b6dfddbd7eb6ccfaa35ca32366c91
2022-01-22 14:07:40 +00:00
TreeHugger Robot
4cdf2aa472 Merge "Mock WifiManager.class for Roboletric test-cases" 2022-01-22 08:33:58 +00:00
Weng Su
ea0425e1f8 Mock WifiPickerTracker.class for Roboletric test-cases
Bug: 214938188
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkRequestDialogActivityTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkRequestDialogFragmentTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkRequestErrorDialogFragmentTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConnectionPreferenceControllerTest

Change-Id: I4c15c2a095203338bb9cf7bcd359242d59bf8b4e
2022-01-21 07:24:21 +00:00
Weng Su
64cc3bf9a4 Mock WifiManager.class for Roboletric test-cases
Bug: 214938188
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddNetworkFragmentTest
make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiEntryFragmentTest
make RunSettingsRoboTests ROBOTEST_FILTER=ContextualWifiSliceTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSliceTest

Change-Id: I96873c48b36ed11b30e32bba1b98b6328ad17bb7
2022-01-21 07:17:37 +00:00
TreeHugger Robot
04f6983ddd Merge "Fix the Robolectric Tests Failures" 2022-01-19 07:04:38 +00:00
Weng Su
d2cdd60139 Fix Robolectric failures for new registerReceiver security design
- Security team add new interface to Context.registerReceiver() with a
third parameter.

- The new interface might have some issues in the test environment.

- Spy the registerReceiver() and unregisterReceiver() to avoid
unexpected issues.

Bug: 214938188
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiPrimarySwitchPreferenceControllerTest

Change-Id: I5bf9fc860a3de99145bc7535ba57cb514b403966
2022-01-18 17:48:28 +00:00
Weng Su
1779bd43e4 Fix the Robolectric Tests Failures
- The ShadowWifiManager class is not working as expected
  - The getSystemService(WifiManager.class) return null when testing

- Use Mockito class instead of Shadow class

Bug: 214906101
Bug: 214938188
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AllInOneTetherSettingsTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest

Change-Id: Ic54af8524fbff1b6ac916ca8e1bcac52f413663a
2022-01-18 14:27:54 +00:00
Tsung-Mao Fang
8498760b07 Ignore broken tests related to wifi tracker lib
Test: Run entire robo tests
Bug: 214938188
Change-Id: Ic23c758737786c2294c400fd2746583fef426f2f
2022-01-17 21:27:25 +08:00
Betty Chang
277976811d Merge "Add WiFi Enterprise restrictions check for WiFi Configuration Addition" 2022-01-12 02:04:17 +00:00
Jimmy Chen
1eac7941ce wifi: fix test failure due to no WifiManager mock
Bug: 0
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
Change-Id: I1d53be79789446ea8fdd9e929130edb56ff21399
2022-01-11 15:01:29 +08:00
changbetty
06df9c9fc0 Add WiFi Enterprise restrictions check for WiFi Configuration Addition
When UserManager.DISALLOW_ADD_WIFI_CONFIG is set to true.
  - Disable the "Add network" item in the Internet settings.

  - Activity action API for ACTION_WIFI_ADD_NETWORKS should not be
    permitted and the user shouldn’t see a prompt for approval

Bug: 203169077
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksActivityTest
Change-Id: I18d7703b5972bfbc12dca10b6432d756813abace
2022-01-10 16:06:20 +00:00
Weng Su
9bd8f046a9 Fix WifiDialogActivityTest broken
- The ShadowWifiManager class is not working as expected

- Use Mockito class instead of Shadow class

Bug: 175369329
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest

Change-Id: Idbc851c4d9702be23561c2c48c9d7d077e5f452e
2022-01-06 08:45:40 +00:00
Betty Chang
fe76826c73 Merge "To disable Wi-Fi Direct when user restriction is set" 2021-12-29 09:55:00 +00:00
Weng Su
fe5690598c Check WiFi restrictions for WiFi QR code intent
- If WiFi configuration is not allowed, the WiFi QR code intent is
ignored.

- Add SafetyNet Logging to b/202017876.

Bug: 202017876
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDppEnrolleeActivityTest

Change-Id: I147d2f4f4fabe2e24d5d3eaaad701b81059e8eee
2021-12-29 09:33:42 +00:00
Weng Su
03f3d9cbe5 Merge "Check WiFi restrictions for WiFi QR code intent" 2021-12-29 09:19:50 +00:00
changbetty
a639d26660 To disable Wi-Fi Direct when user restriction is set
- Remove the Location check for Wi-Fi Direct
 - Add user restriction check for Wi-Fi Direct

Bug: 204288318
Bug: 203170358
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2PPreferenceControllerTest
Change-Id: I64dab964b485665dd42c933d8974aeda47f178fe
2021-12-29 07:20:15 +00:00
Weng Su
26a0fdb4f6 Check WiFi restrictions for WiFi QR code intent
- If WiFi configuration is not allowed, the WiFi QR code intent is
ignored.

- Add SafetyNet Logging to b/202017876.

Bug: 202017876
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDppEnrolleeActivityTest

Change-Id: I147d2f4f4fabe2e24d5d3eaaad701b81059e8eee
2021-12-24 09:44:38 +08:00
Betty Chang
8bf6efba9e Merge "To disable Wi-Fi tethering when user restriction is set" 2021-12-23 07:58:48 +00:00
changbetty
efd5d04ab1 To disable Wi-Fi tethering when user restriction is set
Bug: 203168953
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest
Change-Id: I749de121c3918382bf03e437e683477bac23cae1
2021-12-23 02:08:44 +00:00
Linus Tufvesson
553ca3e58d Make WifiDppEnrolleeActivity launches explicit
Bug: 180518134
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiDppUtilsTest\|WifiDialogActivityTest
Test: Manually verified b/180518134 attack is no longer possible

Change-Id: I8c4e1e17117582c78671d0e4658bd87715a9a046
(cherry picked from commit 59c0a7bc63)
2021-12-20 15:21:25 +00:00
Bonian Chen
5fa5323d3b [Settings] Fix failure test case
Fix test case in Robolectric.

Bug: 209344934
Test: local test
Change-Id: Ia635f977e2262e08ca6bc56436aed624b49a0e30
(cherry picked from commit c4e09e6950)
2021-12-09 12:26:52 +00:00
Bonian Chen
c4e09e6950 [Settings] Fix failure test case
Fix test case in Robolectric.

Bug: 209344934
Test: local test
Change-Id: Ia635f977e2262e08ca6bc56436aed624b49a0e30
2021-12-08 12:34:57 +08:00
Betty Chang
8ed7411e88 Merge "Remove feature flag for provider model in wifi settings" into sc-v2-dev am: 21967a6ff8 am: 4375590837
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16263228

Change-Id: Ie89df57dc909dd6e7272c799bfd390a476b2a4cd
2021-11-18 06:47:22 +00:00
changbetty
39ebb7c9a8 Remove feature flag for provider model in wifi settings
Bug: 206338507
Test: manual test
Change-Id: I1ec83c94f801b489bcc716a6d78cbe7beab9638f
2021-11-17 15:57:14 +00:00
Weng Su
a27167dbd8 Remove ACCESS_COARSE_LOCATION permission checking
- The calling package needs ACCESS_FINE_LOCATION permission to get WiFi
result data.

- The ACCESS_COARSE_LOCATION permission is not allowed.

Bug: 185126813
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest

Change-Id: I2c9013a74d173066270b422ae2179b0d1018f2d7
2021-11-05 01:36:13 +08:00
TreeHugger Robot
a5bae59374 Merge "Add package name check for the calling app" into sc-v2-dev am: 12b7fd54ec am: 631c67dc8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16062219

Change-Id: I7322c5f293cb90e50c5f402004113777119361cc
2021-11-04 03:24:33 +00:00
changbetty
064aa91e45 Add package name check for the calling app
Bug: 198661951
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksActivityTest
Change-Id: I68a543a5c9a5b74db30780f6a6d9f9bc9c6eec08
2021-10-18 03:17:06 +00:00
Weng Su
34b571612f [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
This reverts commit 71e728e934.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: I9251eb35ecba9bcc07eb3763c47c3ad7f55897f1
2021-10-04 07:29:56 +00:00