Merge "Guard against NPE" into rvc-qpr-dev am: cc514fd00d am: 5e6bdc42ee

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12202983

Change-Id: I972d7383e34a1e15d680f7078fe58cce45e07d26
This commit is contained in:
Fabian Kozynski
2020-08-04 18:10:17 +00:00
committed by Automerger Merge Worker

View File

@@ -185,7 +185,9 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
fakeDragBy(getScrollX() - mScroller.getCurrX());
} else if (isFakeDragging()) {
endFakeDrag();
mBounceAnimatorSet.start();
if (mBounceAnimatorSet != null) {
mBounceAnimatorSet.start();
}
setOffscreenPageLimit(1);
}
super.computeScroll();