From 40d9abb773b77b43b7a8a63e394c792e90651c7d Mon Sep 17 00:00:00 2001
From: sunnyshao <sunnyshao@google.com>
Date: Thu, 14 Dec 2023 17:21:25 +0800
Subject: [PATCH] Fix Java crash problem

- Returns the BaseSavedState.EMPTY_STATE to avoid the exception.

Fixes: 312585313
Test: manual test
Change-Id: If21ca5e914a5ee5aff3fbeeee9595bb77a8fc3d0
---
 .../settings/fuelgauge/batteryusage/SpinnerPreference.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreference.java b/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreference.java
index 08101587b77..2bcc7bfd51f 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreference.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreference.java
@@ -81,7 +81,8 @@ public class SpinnerPreference extends Preference {
             return;
         }
         if (!(state instanceof SavedState)) {
-            super.onRestoreInstanceState(state);
+            // To avoid the IllegalArgumentException, return the BaseSavedState.EMPTY_STATE.
+            super.onRestoreInstanceState(BaseSavedState.EMPTY_STATE);
             return;
         }
         SavedState savedState = (SavedState) state;