Merge "Check if boxes still available when restoring state" into pi-dev (f6d5f315) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/widget/HotspotApBandSelectionPreference.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -118,8 +118,8 @@ public class HotspotApBandSelectionPreference extends CustomDialogPreference imp

		SavedState myState = new SavedState(superState);
		myState.shouldRestore = getDialog() != null;
		myState.enabled2G = mBox2G.isChecked();
		myState.enabled5G = mBox5G.isChecked();
		myState.enabled2G = mBox2G != null && mBox2G.isChecked();
		myState.enabled5G = mBox5G != null && mBox5G.isChecked();
		return myState;
		}

+15 −0

Original line number	Diff line number	Diff line
		@@ -115,6 +115,21 @@ public class HotspotApBandSelectionPreferenceTest {
		assertThat(mPreference.mShouldRestore).isFalse();
		}

		@Test
		public void onSaveInstanceState_doesNotCrashWhenViewGone() {
		mPreference.setExistingConfigValue(WifiConfiguration.AP_BAND_2GHZ);
		mPreference.onBindDialogView(mLayout);
		// When the device dozes the view and dialog can become null
		mPreference.mBox5G = null;
		mPreference.mBox2G = null;
		ReflectionHelpers.setField(mPreference, "mFragment", null);

		// make sure it does not crash and state is not restored
		Parcelable parcelable = mPreference.onSaveInstanceState();
		mPreference.onRestoreInstanceState(parcelable);
		assertThat(mPreference.mShouldRestore).isFalse();
		}

		@Test
		public void onSaveInstanceState_presentWhenDialogPresent() {
		mPreference.setExistingConfigValue(WifiConfiguration.AP_BAND_2GHZ);