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

Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578

Change-Id: Iaa8c51b627d423135a7cfce3a55e360493e1d233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
YK Hung
2023-05-17 14:29:10 +00:00
committed by Automerger Merge Worker
parent 3ea5aa92d8 0101e6904f
commit b6f257642c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/fuelgauge/batteryusage/SpinnerPreference.java
View File

@@ -79,10 +79,13 @@ public class SpinnerPreference extends Preference {
@Override @Override
protected void onRestoreInstanceState(Parcelable state) { protected void onRestoreInstanceState(Parcelable state) {
if (state == null || !state.getClass().equals(SavedState.class)) { if (state == null || state == BaseSavedState.EMPTY_STATE) {
super.onRestoreInstanceState(state); super.onRestoreInstanceState(state);
return; return;
} }
if (!(state instanceof SavedState)) {
return;
}
SavedState savedState = (SavedState) state; SavedState savedState = (SavedState) state;
super.onRestoreInstanceState(savedState.getSuperState()); super.onRestoreInstanceState(savedState.getSuperState());
mSavedSpinnerPosition = savedState.getSpinnerPosition(); mSavedSpinnerPosition = savedState.getSpinnerPosition();