Merge "[Wi-Fi] Fix exception when 'Add device' with a Wi-Fi suggestion network" into rvc-dev (e3199b8c) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/details2/AddDevicePreferenceController2.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -51,8 +51,7 @@ public class AddDevicePreferenceController2 extends BasePreferenceController {

		@Override
		public int getAvailabilityStatus() {
		return WifiDppUtils.isSupportConfiguratorQrCodeScanner(mContext, mWifiEntry) ? AVAILABLE
		: CONDITIONALLY_UNAVAILABLE;
		return mWifiEntry.canEasyConnect() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
		}

		@Override

+1 −14

Original line number	Diff line number	Diff line
		@@ -297,7 +297,7 @@ public class WifiDppUtils {
		public static Intent getConfiguratorQrCodeScannerIntentOrNull(Context context,
		WifiManager wifiManager, WifiEntry wifiEntry) {
		final Intent intent = new Intent(context, WifiDppConfiguratorActivity.class);
		if (isSupportConfiguratorQrCodeScanner(context, wifiEntry)) {
		if (wifiEntry.canEasyConnect()) {
		intent.setAction(WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_SCANNER);
		} else {
		return null;
		@@ -452,19 +452,6 @@ public class WifiDppUtils {
		return isSupportWifiDpp(context, accessPoint.getSecurity());
		}

		/**
		* Checks if QR code scanner supports to config other devices with the Wi-Fi network
		*
		* @param context The context to use for {@link WifiManager#isEasyConnectSupported()}
		* @param wifiEntry The {@link WifiEntry} of the Wi-Fi network
		*/
		public static boolean isSupportConfiguratorQrCodeScanner(Context context, WifiEntry wifiEntry) {
		if (wifiEntry.isSubscription()) {
		return false;
		}
		return isSupportWifiDpp(context, wifiEntry.getSecurity());
		}

		/**
		* Checks if QR code generator supports to config other devices with the Wi-Fi network
		*