Merge "Wifi: Handle adding 6GHz band to SoftAP" (dafc3fd3) · Commits · e / os / android_packages_apps_Settings

res/values/arrays.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -277,8 +277,8 @@
		<!-- Wi-Fi AP band settings. Either Auto, 2.4GHz or 5GHz. -->
		<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
		<string-array translatable="false" name="wifi_ap_band_config_full">
		<item>0</item>
		<item>1</item>
		<item>2</item>
		</string-array>

		<string-array translatable="false" name="wifi_ap_band_summary_full">
		@@ -287,8 +287,8 @@
		</string-array>

		<string-array translatable="false" name="wifi_ap_band_dual_mode">
		<item>0</item>
		<item>-1</item>
		<item>1</item>
		<item>3</item>
		</string-array>

		<string-array translatable="false" name="wifi_ap_band_dual_mode_summary">

src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java

+20 −16

Original line number	Diff line number	Diff line
		@@ -48,16 +48,17 @@ public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferen
		public void updateDisplay() {
		final SoftApConfiguration config = mWifiManager.getSoftApConfiguration();
		if (config == null) {
		mBandIndex = 0;
		Log.d(TAG, "Updating band index to 0 because no config");
		mBandIndex = SoftApConfiguration.BAND_2GHZ;
		Log.d(TAG, "Updating band index to BAND_2GHZ because no config");
		} else if (is5GhzBandSupported()) {
		mBandIndex = validateSelection(config.getBand());
		Log.d(TAG, "Updating band index to " + mBandIndex);
		} else {
		mWifiManager.setSoftApConfiguration(
		new SoftApConfiguration.Builder(config).setBand(0).build());
		mBandIndex = config.getBand();
		Log.d(TAG, "5Ghz not supported, updating band index to " + mBandIndex);
		new SoftApConfiguration.Builder(config).setBand(SoftApConfiguration.BAND_2GHZ)
		.build());
		mBandIndex = SoftApConfiguration.BAND_2GHZ;
		Log.d(TAG, "5Ghz not supported, updating band index to 2GHz");
		}
		ListPreference preference =
		(ListPreference) mPreference;
		@@ -74,10 +75,14 @@ public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferen
		}

		String getConfigSummary() {
		if (mBandIndex == SoftApConfiguration.BAND_ANY) {
		switch (mBandIndex) {
		case SoftApConfiguration.BAND_2GHZ:
		return mBandSummaries[0];
		case SoftApConfiguration.BAND_5GHZ:
		return mBandSummaries[1];
		default:
		return mContext.getString(R.string.wifi_ap_prefer_5G);
		}
		return mBandSummaries[mBandIndex];
		}

		@Override
		@@ -95,19 +100,18 @@ public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferen
		}

		private int validateSelection(int band) {
		// Reset the band to 2.4 GHz if we get a weird config back to avoid a crash.
		final boolean isDualMode = mWifiManager.isDualModeSupported();

		// unsupported states:
		// 1: no dual mode means we can't have AP_BAND_ANY - default to 5GHZ
		// 2: no 5 GHZ support means we can't have AP_BAND_5GHZ - default to 2GHZ
		// 3: With Dual mode support we can't have AP_BAND_5GHZ - default to ANY
		if (!isDualMode && SoftApConfiguration.BAND_ANY == band) {
		// 1: no dual mode means we can't have multiband - default to 5GHZ
		// 2: no 5 GHZ support means we can't have BAND_5GHZ - default to 2GHZ
		// 3: With Dual mode support we can't have BAND_5GHZ only - include 2GHZ
		if (!isDualMode
		&& ((band & (SoftApConfiguration.BAND_5GHZ
		\| SoftApConfiguration.BAND_2GHZ)) != 0)) {
		return SoftApConfiguration.BAND_5GHZ;
		} else if (!is5GhzBandSupported() && SoftApConfiguration.BAND_5GHZ == band) {
		return SoftApConfiguration.BAND_2GHZ;
		} else if (isDualMode && SoftApConfiguration.BAND_5GHZ == band) {
		return SoftApConfiguration.BAND_ANY;
		return SoftApConfiguration.BAND_5GHZ \| SoftApConfiguration.BAND_2GHZ;
		}

		return band;