From 6676e1758ba5abc6d27bd5454d6f72728afb09e4 Mon Sep 17 00:00:00 2001
From: Zaiyue Xue <xuezaiyue@google.com>
Date: Thu, 12 Jan 2023 17:10:47 +0800
Subject: [PATCH] Fix b/265054711: Settings crash on changing device
 orientation from battery usage page.

Bug: 265054711
Fix: 265054711
Test: presubmit
Change-Id: I585fb054980d4536bb05d4778cb439031f34232f
---
 .../settings/fuelgauge/batteryusage/SpinnerPreference.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreference.java b/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreference.java
index 47e051c2c0d..eaac00a2588 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreference.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/SpinnerPreference.java
@@ -66,6 +66,9 @@ public class SpinnerPreference extends Preference {
 
     @Override
     protected Parcelable onSaveInstanceState() {
+        if (mSpinner == null) {
+            return super.onSaveInstanceState();
+        }
         Log.d(TAG, "onSaveInstanceState() spinnerPosition=" + mSpinner.getSelectedItemPosition());
         return new SavedState(super.onSaveInstanceState(), mSpinner.getSelectedItemPosition());
     }