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

Merge "[WifiSettings2] Remove redundant save() call for new configs" into rvc-dev am: 4a76598ba5 am: 8de6fc23f2

Browse Source 
Change-Id: I90ff92c278d433650c47e41893073237c3cac263
This commit is contained in:
Automerger Merge Worker
2020-03-02 14:21:05 +00:00
parent 9b798aa738 8de6fc23f2
commit a13d2069e0
1 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/wifi/WifiSettings2.java
View File

@@ -423,8 +423,8 @@ public class WifiSettings2 extends RestrictedSettingsFragment
final WifiConfiguration wifiConfiguration = data.getParcelableExtra( final WifiConfiguration wifiConfiguration = data.getParcelableExtra(
ConfigureWifiEntryFragment.NETWORK_CONFIG_KEY); ConfigureWifiEntryFragment.NETWORK_CONFIG_KEY);
if (wifiConfiguration != null) { if (wifiConfiguration != null) {
mWifiManager.save(wifiConfiguration, mWifiManager.connect(wifiConfiguration,
new WifiSaveThenConnectActionListener(wifiConfiguration)); new WifiConnectActionListener());
} }
} }
return; return;
@@ -970,29 +970,6 @@ public class WifiSettings2 extends RestrictedSettingsFragment
fullScreenEdit)); fullScreenEdit));
} }
private class WifiSaveThenConnectActionListener implements WifiManager.ActionListener {
final WifiConfiguration mWifiConfiguration;
WifiSaveThenConnectActionListener(WifiConfiguration wifiConfiguration) {
mWifiConfiguration = wifiConfiguration;
}
@Override
public void onSuccess() {
mWifiManager.connect(mWifiConfiguration, new WifiConnectActionListener());
}
@Override
public void onFailure(int reason) {
final Activity activity = getActivity();
if (isFisishingOrDestroyed(activity)) {
return;
}
Toast.makeText(activity, R.string.wifi_failed_save_message, Toast.LENGTH_SHORT).show();
}
};
private class WifiConnectActionListener implements WifiManager.ActionListener { private class WifiConnectActionListener implements WifiManager.ActionListener {
@Override @Override
public void onSuccess() { public void onSuccess() {