Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c6d93c4 authored by YK Hung's avatar YK Hung Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578



Change-Id: I9b423b11611b88f2a93e2488b9a6ca9361437878
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a78c4bff 0101e690

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

+4 −1
Original line number Diff line number Diff line
@@ -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();