Merge "FalsingManager: Allow disabling the HIC via device config flag" into oc-mr1-dev am: b0d617a643
am: dc70defa05
Change-Id: I6477e57f61eb3b80795b8eed273d3a123b382699
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 89e2675..87f6306 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -417,4 +417,9 @@
vibrator is capable of subtle vibrations -->
<bool name="config_vibrateOnIconAnimation">false</bool>
+ <!-- If true, enable the advance anti-falsing classifier on the lockscreen. On some devices it
+ does not work well, particularly with noisy touchscreens. Note that disabling it may
+ increase the rate of unintentional unlocks. -->
+ <bool name="config_lockscreenAntiFalsingClassifierEnabled">true</bool>
+
</resources>
diff --git a/packages/SystemUI/src/com/android/systemui/classifier/HumanInteractionClassifier.java b/packages/SystemUI/src/com/android/systemui/classifier/HumanInteractionClassifier.java
index 2e9ba56..592a275 100644
--- a/packages/SystemUI/src/com/android/systemui/classifier/HumanInteractionClassifier.java
+++ b/packages/SystemUI/src/com/android/systemui/classifier/HumanInteractionClassifier.java
@@ -27,6 +27,8 @@
import android.util.Log;
import android.view.MotionEvent;
+import com.android.systemui.R;
+
import java.util.ArrayDeque;
import java.util.ArrayList;
@@ -37,9 +39,6 @@
private static final String HIC_ENABLE = "HIC_enable";
private static final float FINGER_DISTANCE = 0.1f;
- /** Default value for the HIC_ENABLE setting: 1 - enabled, 0 - disabled */
- private static final int HIC_ENABLE_DEFAULT = 1;
-
private static HumanInteractionClassifier sInstance = null;
private final Handler mHandler = new Handler(Looper.getMainLooper());
@@ -106,9 +105,12 @@
}
private void updateConfiguration() {
+ boolean defaultValue = mContext.getResources().getBoolean(
+ R.bool.config_lockscreenAntiFalsingClassifierEnabled);
+
mEnableClassifier = 0 != Settings.Global.getInt(
mContext.getContentResolver(),
- HIC_ENABLE, HIC_ENABLE_DEFAULT);
+ HIC_ENABLE, defaultValue ? 1 : 0);
}
public void setType(int type) {