Merge \"Fix tethering re-enable after edit.\" into nyc-dev (cd2d94b2) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/TetherSettings.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -280,6 +280,14 @@ public class TetherSettings extends RestrictedSettingsFragment
		Log.d(TAG, "Restarting WifiAp due to prior config change.");
		startTethering(TETHERING_WIFI);
		}
		} else if (action.equals(WifiManager.WIFI_AP_STATE_CHANGED_ACTION)) {
		int state = intent.getIntExtra(WifiManager.EXTRA_WIFI_AP_STATE, 0);
		if (state == 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();
		@@ -331,6 +339,7 @@ public class TetherSettings extends RestrictedSettingsFragment
		mMassStorageActive = Environment.MEDIA_SHARED.equals(Environment.getExternalStorageState());
		mTetherChangeReceiver = new TetherChangeReceiver();
		IntentFilter filter = new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
		filter.addAction(WifiManager.WIFI_AP_STATE_CHANGED_ACTION);
		Intent intent = activity.registerReceiver(mTetherChangeReceiver, filter);

		filter = new IntentFilter();