Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578 Change-Id: Iaa8c51b627d423135a7cfce3a55e360493e1d233 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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();
|
||||
|
Reference in New Issue
Block a user