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

DO NOT MERGE Fix build with SDK 24-like implementation of constructor

Browse Source 
Bug: 71992105
Test: manual
Change-Id: I106760ada9c85adde29fd143e5dfcd924fd95f54
This commit is contained in:
Alan Viverette
2018-03-13 13:56:24 -04:00
parent 64377471f0
commit f3c2e0b3ab
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) {
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