From 6235f4b69acf412010972fe5e6e307fa19313b22 Mon Sep 17 00:00:00 2001
From: Zaiyue Xue <xuezaiyue@google.com>
Date: Wed, 17 May 2023 15:40:23 +0800
Subject: [PATCH] Fix b/282944866: Java crash

Bug: 282944866
Fix: 282944866
Test: presubmit
Change-Id: I6dd9d15f21d4fcb3e75847c5727b18bdafbfa09b
---
 .../settings/fuelgauge/batteryusage/SpinnerPreference.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreference.java b/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreference.java
index 800dc1426e6..ac3e26d5de4 100644
--- 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();