commit b8a4577914910c5365e95ca445c31a110d167e7d
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jan 12 10:34:05 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 12 10:34:05 2023 +0000
tree d9301c77d14fa1e3cd8145cc4aeedb16f5e68040
parent 9e9886997fcd21158d73ffc66d1aa11fe971c406
parent 6676e1758ba5abc6d27bd5454d6f72728afb09e4

Merge "Fix b/265054711: Settings crash on changing device orientation from battery usage page."

src/com/android/settings/fuelgauge/batteryusage/SpinnerPreference.java

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