Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352

Browse Source 
Change-Id: Ib890ce7495c1d5e64968cc9177ce3785bcfdedde
This commit is contained in:
Android Build Merger (Role)
2018-03-14 15:23:39 +00:00
parent 765a5e785d d0fcb49352
commit 93f8bfa5c4
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/com/android/internal/widget/ViewPager.java
View File

@@ -1255,7 +1255,7 @@ public class ViewPager extends ViewGroup {
}; };
SavedState(Parcel in, ClassLoader loader) { SavedState(Parcel in, ClassLoader loader) {
super(in, loader); super(loadParcelable(in, loader));
if (loader == null) { if (loader == null) {
loader = getClass().getClassLoader(); loader = getClass().getClassLoader();
} }
@@ -1263,6 +1263,16 @@ public class ViewPager extends ViewGroup {
adapterState = in.readParcelable(loader); adapterState = in.readParcelable(loader);
this.loader = 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 @Override