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

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

Change-Id: Iaeddc252f3242f89b93f9a540261787df2a937e4

1 files changed, 3 insertions, 1 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
index 3eed8ad89075..7cd1c7861164 100644
--- 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();