Save WifiAp config changes when hotspot is enabled
We need to properly handle asynchronous events when WifiAp for hotspot
is enabled and the user changes the config. This CL changes the
behavior to:
1 - mark local boolean indicating a restart is needed
2 - trigger the WifiAp to stop
3 - save the new config
4 - when the stop is complete (and the boolean is set), restart the
WifiAp.
Also fix a few style issues in the file.
BUG:27460194
Change-Id: I7e49ab9c49e125017cf83866a396701e440bf383
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 0338020..43bcb57 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -42,6 +42,7 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import android.util.Log;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.wifi.WifiApDialog;
@@ -65,6 +66,8 @@
private static final int DIALOG_AP_SETTINGS = 1;
+ private static final String TAG = "TetheringSettings";
+
private SwitchPreference mUsbTether;
private WifiApEnabler mWifiApEnabler;
@@ -95,6 +98,8 @@
private WifiConfiguration mWifiConfig = null;
private ConnectivityManager mCm;
+ private boolean mRestartWifiApAfterConfigChange;
+
private boolean mUsbConnected;
private boolean mMassStorageActive;
@@ -141,7 +146,7 @@
mUsbTether = (SwitchPreference) findPreference(USB_TETHER_SETTINGS);
mBluetoothTether = (SwitchPreference) findPreference(ENABLE_BLUETOOTH_TETHERING);
- mCm = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
+ mCm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
mUsbRegexs = mCm.getTetherableUsbRegexs();
mWifiRegexs = mCm.getTetherableWifiRegexs();
@@ -183,6 +188,8 @@
mCreateNetwork = findPreference(WIFI_AP_SSID_AND_SECURITY);
+ mRestartWifiApAfterConfigChange = false;
+
if (mWifiConfig == null) {
final String s = activity.getString(
com.android.internal.R.string.wifi_tether_configure_ssid_default);
@@ -222,6 +229,12 @@
updateState(available.toArray(new String[available.size()]),
active.toArray(new String[active.size()]),
errored.toArray(new String[errored.size()]));
+ if (mWifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_DISABLED
+ && mRestartWifiApAfterConfigChange) {
+ mRestartWifiApAfterConfigChange = false;
+ Log.d(TAG, "Restarting WifiAp due to prior config change.");
+ startTethering(TETHERING_WIFI);
+ }
} else if (action.equals(Intent.ACTION_MEDIA_SHARED)) {
mMassStorageActive = true;
updateState();
@@ -391,8 +404,9 @@
}
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
- if (adapter == null)
+ if (adapter == null) {
return;
+ }
int btState = adapter.getState();
if (btState == BluetoothAdapter.STATE_TURNING_OFF) {
mBluetoothTether.setEnabled(false);
@@ -402,8 +416,8 @@
mBluetoothTether.setSummary(R.string.bluetooth_turning_on);
} else {
BluetoothPan bluetoothPan = mBluetoothPan.get();
- if (btState == BluetoothAdapter.STATE_ON && bluetoothPan != null &&
- bluetoothPan.isTetheringOn()) {
+ if (btState == BluetoothAdapter.STATE_ON && bluetoothPan != null
+ && bluetoothPan.isTetheringOn()) {
mBluetoothTether.setChecked(true);
mBluetoothTether.setEnabled(true);
int bluetoothTethered = bluetoothPan.getConnectedDevices().size();
@@ -506,11 +520,12 @@
* TODO: update config on a running access point when framework support is added
*/
if (mWifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_ENABLED) {
- mWifiManager.setWifiApEnabled(null, false);
- mWifiManager.setWifiApEnabled(mWifiConfig, true);
- } else {
- mWifiManager.setWifiApConfiguration(mWifiConfig);
+ Log.d("TetheringSettings",
+ "Wifi AP config changed while enabled, stop and restart");
+ mRestartWifiApAfterConfigChange = true;
+ mCm.stopTethering(TETHERING_WIFI);
}
+ mWifiManager.setWifiApConfiguration(mWifiConfig);
int index = WifiApDialog.getSecurityTypeIndex(mWifiConfig);
mCreateNetwork.setSummary(String.format(getActivity().getString(CONFIG_SUBTEXT),
mWifiConfig.SSID,