From 60f36e44b622e5a2c04da7a81302809f1c2553c1 Mon Sep 17 00:00:00 2001 From: Fabian Kozynski Date: Mon, 20 Jul 2020 13:11:07 -0400 Subject: [PATCH] Guard against NPE Test: build Bug: 161166697 Change-Id: I06d7a81b522fe372a1a610791e1598d205e4339c --- .../SystemUI/src/com/android/systemui/qs/PagedTileLayout.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java index 3eed8ad89075f..7cd1c78611647 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();