Merge "Fixes the issue multi-touch causing launcher icons to be not clickable." into rvc-dev am: 94df031718 am: b2f5bfcfc2

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

Change-Id: I50fffd460903d41e8b31f56f506ea0ec7317d694

1 files changed, 3 insertions, 2 deletions

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 226f57976ec8..f2bc89e9deb6 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -10900,17 +10900,18 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
      *    not among the handles.
      */
     boolean isFromPrimePointer(MotionEvent event, boolean fromHandleView) {
+        boolean res = true;
         if (mPrimePointerId == NO_POINTER_ID)  {
             mPrimePointerId = event.getPointerId(0);
             mIsPrimePointerFromHandleView = fromHandleView;
         } else if (mPrimePointerId != event.getPointerId(0)) {
-            return mIsPrimePointerFromHandleView && fromHandleView;
+            res = mIsPrimePointerFromHandleView && fromHandleView;
         }
         if (event.getActionMasked() == MotionEvent.ACTION_UP
             || event.getActionMasked() == MotionEvent.ACTION_CANCEL) {
             mPrimePointerId = -1;
         }
-        return true;
+        return res;
     }
 
     @Override