From 1ba06557312d67deb6d70661d4d57916615328b0 Mon Sep 17 00:00:00 2001
From: Fabian Kozynski <kozynski@google.com>
Date: Wed, 2 Sep 2020 10:25:02 -0400
Subject: [PATCH] Guard aginst another NPE

Cannot find what is actually going on. Some reports have the error from
line 165, but some don't. There's no particular repro steps.

Test: build
Fixes: 162801646
Change-Id: Ieff5db9146f95273d3db216834c1e93eed765514
---
 .../src/com/android/systemui/qs/PagedTileLayout.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
index 7cd1c78611647..44803aedc4ea2 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
@@ -176,6 +176,16 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
         }
     }
 
+    @Override
+    public void endFakeDrag() {
+        try {
+            super.endFakeDrag();
+        } catch (NullPointerException e) {
+            // Not sure what's going on. Let's log it
+            Log.e(TAG, "endFakeDrag called without velocityTracker", e);
+        }
+    }
+
     @Override
     public void computeScroll() {
         if (!mScroller.isFinished() && mScroller.computeScrollOffset()) {