From 980a44e69c45b9271fa8b8c6da1e2097cda564aa Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Wed, 23 Aug 2017 12:21:23 -0700
Subject: Fixed an issue where isFalseTouch could be queried

We shouldn't forward any touches if we're not on the
lockscreen.

Test: drag down, turn of the screen
Change-Id: I90acdd7e57322227042b98741721fec977b80f97
Fixes: 63165400
---
 .../SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java  | 5 +++++
 .../SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java
index 334991fd3516..1bbf84855eba 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java
@@ -30,6 +30,7 @@ import com.android.systemui.Gefingerpoken;
 import com.android.systemui.Interpolators;
 import com.android.systemui.R;
 import com.android.systemui.classifier.FalsingManager;
+import com.android.systemui.statusbar.phone.StatusBar;
 
 /**
  * A utility class to enable the downward swipe on the lockscreen to go to the full shade and expand
@@ -149,6 +150,9 @@ public class DragDownHelper implements Gefingerpoken {
     }
 
     private boolean isFalseTouch() {
+        if (!mDragDownCallback.isFalsingCheckNeeded()) {
+            return false;
+        }
         return mFalsingManager.isFalseTouch() || !mDraggedFarEnough;
     }
 
@@ -249,5 +253,6 @@ public class DragDownHelper implements Gefingerpoken {
         void onCrossedThreshold(boolean above);
         void onTouchSlopExceeded();
         void setEmptyDragAmount(float amount);
+        boolean isFalsingCheckNeeded();
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index 59e7005e7daf..2ce561f44455 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -4943,6 +4943,11 @@ public class StatusBar extends SystemUI implements DemoMode,
         mNotificationPanel.setEmptyDragAmount(amount);
     }
 
+    @Override
+    public boolean isFalsingCheckNeeded() {
+        return mState == StatusBarState.KEYGUARD;
+    }
+
     /**
      * If secure with redaction: Show bouncer, go to unlocked shade.
      *
-- 
cgit v1.2.3-59-g8ed1b