PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WiFi restricted connection when scan QR code

Browse Source 
- 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
This commit is contained in:
Weng Su
2022-04-01 06:04:34 +08:00
parent 51316c13a1
commit 2088b4985d
2 changed files with 110 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
View File

@@ -117,7 +117,8 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
private int mLatestStatusCode = WifiDppUtils.EASY_CONNECT_EVENT_FAILURE_NONE;
private WifiPickerTracker mWifiPickerTracker;
@VisibleForTesting
WifiPickerTracker mWifiPickerTracker;
private HandlerThread mWorkerThread;
private final Handler mHandler = new Handler() {
@@ -193,6 +194,9 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
if (id == -1) {
continue;
}
if (!canConnectWifi(qrCodeWifiConfiguration.SSID)) return;
wifiManager.enableNetwork(id, /* attemptConnect */ false);
// WifiTracker only contains a hidden SSID Wi-Fi network if it's saved.
// We can't check if a hidden SSID Wi-Fi network is reachable in advance.
@@ -266,6 +270,21 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
return false;
}
@VisibleForTesting
boolean canConnectWifi(String ssid) {
final List<WifiEntry> wifiEntries = mWifiPickerTracker.getWifiEntries();
for (WifiEntry wifiEntry : wifiEntries) {
if (!TextUtils.equals(wifiEntry.getSsid(), sanitizeSsid(ssid))) continue;
if (!wifiEntry.canConnect()) {
Log.w(TAG, "Wi-Fi is not allowed to connect by your organization. SSID:" + ssid);
showErrorMessageAndRestartCamera(R.string.not_allowed_by_ent);
return false;
}
}
return true;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -575,7 +594,8 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
message.sendToTarget();
}
private void showErrorMessageAndRestartCamera(@StringRes int messageResId) {
@VisibleForTesting
void showErrorMessageAndRestartCamera(@StringRes int messageResId) {
final Message message = mHandler.obtainMessage(MESSAGE_SHOW_ERROR_MESSAGE,
getString(messageResId));
message.arg1 = ARG_RESTART_CAMERA;
@@ -603,6 +623,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
if (wifiConfig.networkId == newNetworkId) {
mLatestStatusCode = WifiDppUtils.EASY_CONNECT_EVENT_SUCCESS;
mEnrolleeWifiConfiguration = wifiConfig;
if (!canConnectWifi(wifiConfig.SSID)) return;
wifiManager.connect(wifiConfig, WifiDppQrCodeScannerFragment.this);
return;
}