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

Merge "[Wi-Fi] Fix exception when 'Add device' with a Wi-Fi suggestion network" into rvc-dev

Browse Source
This commit is contained in:
Arc Wang
2020-04-03 12:52:14 +00:00
committed by Android (Google) Code Review
parent 710fd22f81 75d6c9fce3
commit e3199b8c11
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/wifi/details2/AddDevicePreferenceController2.java
View File

@@ -51,8 +51,7 @@ public class AddDevicePreferenceController2 extends BasePreferenceController {
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return WifiDppUtils.isSupportConfiguratorQrCodeScanner(mContext, mWifiEntry) ? AVAILABLE return mWifiEntry.canEasyConnect() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
: CONDITIONALLY_UNAVAILABLE;
} }
@Override @Override

15
src/com/android/settings/wifi/dpp/WifiDppUtils.java
View File

@@ -297,7 +297,7 @@ public class WifiDppUtils {
public static Intent getConfiguratorQrCodeScannerIntentOrNull(Context context, public static Intent getConfiguratorQrCodeScannerIntentOrNull(Context context,
WifiManager wifiManager, WifiEntry wifiEntry) { WifiManager wifiManager, WifiEntry wifiEntry) {
final Intent intent = new Intent(context, WifiDppConfiguratorActivity.class); final Intent intent = new Intent(context, WifiDppConfiguratorActivity.class);
if (isSupportConfiguratorQrCodeScanner(context, wifiEntry)) { if (wifiEntry.canEasyConnect()) {
intent.setAction(WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_SCANNER); intent.setAction(WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_SCANNER);
} else { } else {
return null; return null;
@@ -452,19 +452,6 @@ public class WifiDppUtils {
return isSupportWifiDpp(context, accessPoint.getSecurity()); 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 * Checks if QR code generator supports to config other devices with the Wi-Fi network
* *