commit 6dc59b48c040cf6871d7ff6d8e5242b1a5ddd032
author Blazej Magnowski <johnasselta@google.com> Tue Sep 22 15:14:20 2015 -0700
committer Blazej Magnowski <johnasselta@google.com> Fri Sep 25 12:36:25 2015 -0700
tree e3561cdfe40af947c2db68234240d29e864e6060
parent 0b29ba687eb59d215c993709ada61aeb31b5c108

Integration into other unlock mechanisms

Replaces all the older falsing thresholds unless the
HumanInteractionClassifier is disabled.

Change-Id: Idfc3cb1b6bc0bbdbc792cd75499f0c3b4f1b7142

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
index 3feead8..bd16257 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -610,8 +610,8 @@
         if (!mStatusBar.isFalsingThresholdNeeded()) {
             return false;
         }
-        if (mFalsingManager.isFalseTouch()) {
-            return true;
+        if (mFalsingManager.isClassiferEnabled()) {
+            return mFalsingManager.isFalseTouch();
         }
         if (!mTouchAboveFalsingThreshold) {
             return true;