commit 2c956a465163242453e5e31de86bd116188d804e
author Tony Wickham <twickham@google.com> Mon Oct 26 22:08:00 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 26 22:08:00 2020 +0000
tree 998d09a70b96b3280795ba76ee9d64edf20b56e2
parent 47dfc3a3cafad66a2f19d0f935aeed3ea55d62b5
parent c1a785914a969c1dfcc84fe55652882910c4a284

Merge "Add null check between calling onMotionPauseDetected() and Changed()" into ub-launcher3-master

quickstep/src/com/android/quickstep/util/MotionPauseDetector.java

diff --git a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
index d0f6879..da5f59e 100644
--- a/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
+++ b/quickstep/src/com/android/quickstep/util/MotionPauseDetector.java
@@ -193,7 +193,10 @@
                 if (isFirstDetectedPause) {
                     mOnMotionPauseListener.onMotionPauseDetected();
                 }
-                mOnMotionPauseListener.onMotionPauseChanged(mIsPaused);
+                // Null check again as onMotionPauseDetected() maybe have called clear().
+                if (mOnMotionPauseListener != null) {
+                    mOnMotionPauseListener.onMotionPauseChanged(mIsPaused);
+                }
             }
         }
     }