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

Check if boxes still available when restoring state

Browse Source 
Apparently when the device is idle long enough the system will clean
up the dialog view for the hotspot band preference. This will cause
restore state to fail once it decides to pause the activity. To avoid
this we should make sure the boxes are not null.

Test: robotest
Bug: 78445411
Change-Id: I2a82b01f894f62be6c5209c78faddc4089aa6301
This commit is contained in:
Salvador Martinez
2018-04-23 16:52:25 -07:00
parent ac951a69aa
commit be6a844a06
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/widget/HotspotApBandSelectionPreference.java
View File

@@ -118,8 +118,8 @@ public class HotspotApBandSelectionPreference extends CustomDialogPreference imp
SavedState myState = new SavedState(superState); SavedState myState = new SavedState(superState);
myState.shouldRestore = getDialog() != null; myState.shouldRestore = getDialog() != null;
myState.enabled2G = mBox2G.isChecked(); myState.enabled2G = mBox2G != null && mBox2G.isChecked();
myState.enabled5G = mBox5G.isChecked(); myState.enabled5G = mBox5G != null && mBox5G.isChecked();
return myState; return myState;
} }

15
tests/robotests/src/com/android/settings/widget/HotspotApBandSelectionPreferenceTest.java
View File

@@ -115,6 +115,21 @@ public class HotspotApBandSelectionPreferenceTest {
assertThat(mPreference.mShouldRestore).isFalse(); 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 @Test
public void onSaveInstanceState_presentWhenDialogPresent() { public void onSaveInstanceState_presentWhenDialogPresent() {
mPreference.setExistingConfigValue(WifiConfiguration.AP_BAND_2GHZ); mPreference.setExistingConfigValue(WifiConfiguration.AP_BAND_2GHZ);