Merge "Guard against NPE" into rvc-qpr-dev

2020-08-04 17:33:47 +00:00
parent 1ed9a7feb1 60f36e44b6
commit cc514fd00d
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
@@ -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();