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

2023-05-17 13:45:32 +00:00
parent 74ab90bb53 6235f4b69a
commit 0101e6904f
1 changed files with 4 additions and 1 deletions
--- a/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreference.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreference.java
@@ -79,10 +79,13 @@ public class SpinnerPreference extends Preference {

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