[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of... (93f8bfa5) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/ViewPager.java

+11 −1

Original line number	Diff line number	Diff line
		@@ -1255,7 +1255,7 @@ public class ViewPager extends ViewGroup {
		};

		SavedState(Parcel in, ClassLoader loader) {
		super(in, loader);
		super(loadParcelable(in, loader));
		if (loader == null) {
		loader = getClass().getClassLoader();
		}
		@@ -1263,6 +1263,16 @@ public class ViewPager extends ViewGroup {
		adapterState = in.readParcelable(loader);
		this.loader = loader;
		}

		/**
		* Substitute for AbsSavedState two-arg constructor, which was added in
		* SDK 24. Loads the super state from a given class loader or returns
		* the empty state if null.
		*/
		private static Parcelable loadParcelable(Parcel in, ClassLoader loader) {
		Parcelable superState = in.readParcelable(loader);
		return superState != null ? superState : AbsSavedState.EMPTY_STATE;
		}
		}

		@Override