Merge "[Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner &... (ea15072a) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -390,7 +390,7 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
		WifiDppUtils.getSecurityString(wifiConfiguration),
		wifiConfiguration.getPrintableSsid(),
		wifiConfiguration.preSharedKey,
		/* hiddenSsid */ false,
		wifiConfiguration.hiddenSSID,
		wifiConfiguration.networkId,
		/* isHotspot */ false);
		}

src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -172,22 +172,25 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl

		// Adds all Wi-Fi networks in QR code to the set of configured networks and
		// connects to it if it's reachable.
		boolean hasReachableWifiNetwork = false;
		boolean hasHiddenOrReachableWifiNetwork = false;
		for (WifiConfiguration qrCodeWifiConfiguration : qrCodeWifiConfigurations) {
		final int id = wifiManager.addNetwork(qrCodeWifiConfiguration);
		if (id == -1) {
		continue;
		}
		wifiManager.enableNetwork(id, /* attemptConnect */ false);
		if (isReachableWifiNetwork(qrCodeWifiConfiguration)) {
		hasReachableWifiNetwork = true;
		// 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.
		if (qrCodeWifiConfiguration.hiddenSSID \|\|
		isReachableWifiNetwork(qrCodeWifiConfiguration)) {
		hasHiddenOrReachableWifiNetwork = true;
		mEnrolleeWifiConfiguration = qrCodeWifiConfiguration;
		wifiManager.connect(id,
		/* listener */ WifiDppQrCodeScannerFragment.this);
		}
		}

		if (hasReachableWifiNetwork == false) {
		if (!hasHiddenOrReachableWifiNetwork) {
		showErrorMessageAndRestartCamera(
		R.string.wifi_dpp_check_connection_try_again);
		return;

src/com/android/settings/wifi/dpp/WifiDppUtils.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -296,6 +296,7 @@ public class WifiDppUtils {
		if (!TextUtils.isEmpty(preSharedKey)) {
		intent.putExtra(EXTRA_WIFI_PRE_SHARED_KEY, preSharedKey);
		}
		intent.putExtra(EXTRA_WIFI_HIDDEN_SSID, wifiConfiguration.hiddenSSID);
		}

		/**

src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -220,7 +220,7 @@ public class WifiNetworkListFragment extends SettingsPreferenceFragment implemen
		}
		final WifiNetworkConfig networkConfig = WifiNetworkConfig.getValidConfigOrNull(
		selectedAccessPoint.getSecurityString(/* concise */ true),
		wifiConfig.getPrintableSsid(), wifiConfig.preSharedKey, /* hiddenSsid */ false,
		wifiConfig.getPrintableSsid(), wifiConfig.preSharedKey, wifiConfig.hiddenSSID,
		wifiConfig.networkId, /* isHotspot */ false);
		if (mOnChooseNetworkListener != null) {
		mOnChooseNetworkListener.onChooseNetwork(networkConfig);

tests/robotests/src/com/android/settings/wifi/dpp/WifiDppUtilsTest.java

0 → 100644

+83 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.wifi.dpp;

		import static com.google.common.truth.Truth.assertThat;

		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.when;

		import android.content.Context;
		import android.content.Intent;
		import android.net.wifi.WifiConfiguration;
		import android.net.wifi.WifiConfiguration.KeyMgmt;
		import android.net.wifi.WifiManager;

		import com.android.settingslib.wifi.AccessPoint;

		import java.util.BitSet;

		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;
		import org.robolectric.RobolectricTestRunner;
		import org.robolectric.RuntimeEnvironment;
		import org.robolectric.shadows.ShadowApplication;

		@RunWith(RobolectricTestRunner.class)
		public class WifiDppUtilsTest {

		@Mock
		private WifiManager mWifiManager;

		@Mock
		private AccessPoint mAccessPoint;

		@Mock
		private WifiConfiguration mWifiConfiguration;

		private Context mContext;

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);

		mContext = spy(RuntimeEnvironment.application);
		ShadowApplication shadowApplication = ShadowApplication.getInstance();
		shadowApplication.setSystemService(Context.WIFI_SERVICE, mWifiManager);
		}

		@Test
		public void getConfiguratorQrCodeScannerIntentOrNull_hiddenSsidNetwork_hasHiddenSsidExtra() {
		when(mWifiManager.isEasyConnectSupported()).thenReturn(true);
		when(mAccessPoint.isPasspoint()).thenReturn(false);
		when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK);
		when(mAccessPoint.getConfig()).thenReturn(mWifiConfiguration);
		mWifiConfiguration.SSID = "GuestNetwork";
		mWifiConfiguration.allowedKeyManagement = new BitSet();
		mWifiConfiguration.allowedKeyManagement.set(KeyMgmt.WPA_PSK);
		mWifiConfiguration.hiddenSSID = true;

		Intent intent = WifiDppUtils
		.getConfiguratorQrCodeScannerIntentOrNull(mContext, mWifiManager, mAccessPoint);

		assertThat(intent.getBooleanExtra(WifiDppUtils.EXTRA_WIFI_HIDDEN_SSID, false))
		.isEqualTo(true);
		}
		}