commit 1e42ff6353fe3c19a221b87926b68c94355d6e05
author Randy Pfohl <randypfohl@google.com> Tue Mar 07 23:22:01 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 07 23:22:01 2023 +0000
tree c42b26f9f0f7653a3004b638d8a2f6dab3949209
parent c01068f42e1b47a7ed8b723731dd291f8ee5afb8
parent 583241e6556ee573541096bc28c17705d3f2e612

Merge "fixing rare NPE" into tm-qpr-dev

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index c7431ed..e3bce87 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1370,8 +1370,14 @@
                 int velocity = (int) mOrientationHandler.getPrimaryVelocity(velocityTracker,
                         mActivePointerId);
                 float delta = primaryDirection - mDownMotionPrimary;
-                int pageOrientedSize = (int) (mOrientationHandler.getMeasuredSize(
-                        getPageAt(mCurrentPage))
+
+                View current = getPageAt(mCurrentPage);
+                if (current == null) {
+                    Log.e(TAG, "current page was null. this should not happen.");
+                    return true;
+                }
+
+                int pageOrientedSize = (int) (mOrientationHandler.getMeasuredSize(current)
                         * mOrientationHandler.getPrimaryScale(this));
                 boolean isSignificantMove = isSignificantMove(Math.abs(delta), pageOrientedSize);