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

Merge "Fix Settings crash after clicking 'Share Wi-Fi' button"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-02-27 07:06:38 +00:00
committed by Android (Google) Code Review
parent 5d0d664ae2 730a6c0f5e
commit 6e245f4736
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
View File

@@ -156,7 +156,7 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
cancelActivity = true; cancelActivity = true;
} else { } else {
final WifiNetworkConfig connectedConfig = getConnectedWifiNetworkConfigOrNull(); final WifiNetworkConfig connectedConfig = getConnectedWifiNetworkConfigOrNull();
if (connectedConfig == null) { if (connectedConfig == null || !connectedConfig.isSupportWifiDpp(this)) {
showChooseSavedWifiNetworkFragment(/* addToBackStack */ false); showChooseSavedWifiNetworkFragment(/* addToBackStack */ false);
} else { } else {
mWifiNetworkConfig = connectedConfig; mWifiNetworkConfig = connectedConfig;

2
src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
View File

@@ -86,7 +86,7 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment {
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
final WifiNetworkConfig wifiNetworkConfig = getWifiNetworkConfigFromHostActivity(); final WifiNetworkConfig wifiNetworkConfig = getWifiNetworkConfigFromHostActivity();
MenuItem menuItem; MenuItem menuItem;
if (wifiNetworkConfig.isSupportConfiguratorQrCodeScanner(getActivity())) { if (wifiNetworkConfig.isSupportWifiDpp(getActivity())) {
menuItem = menu.add(0, Menu.FIRST, 0, R.string.next_label); menuItem = menu.add(0, Menu.FIRST, 0, R.string.next_label);
menuItem.setIcon(R.drawable.ic_scan_24dp); menuItem.setIcon(R.drawable.ic_scan_24dp);
menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);

2
src/com/android/settings/wifi/dpp/WifiNetworkConfig.java
View File

@@ -212,7 +212,7 @@ public class WifiNetworkConfig {
wifiManager.connect(wifiConfiguration, listener); wifiManager.connect(wifiConfiguration, listener);
} }
public boolean isSupportConfiguratorQrCodeScanner(Context context) { public boolean isSupportWifiDpp(Context context) {
if (!WifiDppUtils.isWifiDppEnabled(context)) { if (!WifiDppUtils.isWifiDppEnabled(context)) {
return false; return false;
} }