Fix Settings crash after clicking 'Share Wi-Fi' button
When connecting to an open network, Settings crash after scanning Wi-Fi DPP QR code and clicking 'Share Wi-Fi' button. When choosing default network for configurator usage, should make sure if it supports Wi-Fi DPP or not. Bug: 126456582 Test: manual test atest WifiQrCodeTest WifiDppConfiguratorActivityTest WifiDppEnrolleeActivityTest WifiDppQrCodeGeneratorFragmentTest WifiDppQrCodeScannerFragmentTest WifiNetworkListFragmentTest WifiDppChooseSavedWifiNetworkFragmentTest Change-Id: I66ee9b01314b84213ecb3016e6e72ff71af8dfc7
This commit is contained in:
@@ -156,7 +156,7 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
|
||||
cancelActivity = true;
|
||||
} else {
|
||||
final WifiNetworkConfig connectedConfig = getConnectedWifiNetworkConfigOrNull();
|
||||
if (connectedConfig == null) {
|
||||
if (connectedConfig == null || !connectedConfig.isSupportWifiDpp(this)) {
|
||||
showChooseSavedWifiNetworkFragment(/* addToBackStack */ false);
|
||||
} else {
|
||||
mWifiNetworkConfig = connectedConfig;
|
||||
|
@@ -86,7 +86,7 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment {
|
||||
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
|
||||
final WifiNetworkConfig wifiNetworkConfig = getWifiNetworkConfigFromHostActivity();
|
||||
MenuItem menuItem;
|
||||
if (wifiNetworkConfig.isSupportConfiguratorQrCodeScanner(getActivity())) {
|
||||
if (wifiNetworkConfig.isSupportWifiDpp(getActivity())) {
|
||||
menuItem = menu.add(0, Menu.FIRST, 0, R.string.next_label);
|
||||
menuItem.setIcon(R.drawable.ic_scan_24dp);
|
||||
menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
|
||||
|
@@ -212,7 +212,7 @@ public class WifiNetworkConfig {
|
||||
wifiManager.connect(wifiConfiguration, listener);
|
||||
}
|
||||
|
||||
public boolean isSupportConfiguratorQrCodeScanner(Context context) {
|
||||
public boolean isSupportWifiDpp(Context context) {
|
||||
if (!WifiDppUtils.isWifiDppEnabled(context)) {
|
||||
return false;
|
||||
}
|
||||
|
Reference in New Issue
Block a user