Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable anti-falsing logic with touch exploration" into nyc-dev

Browse Source
This commit is contained in:
Adrian Roos
2016-04-20 00:38:05 +00:00
committed by Android (Google) Code Review
parent 5d65340fc5 ca664b93b9
commit ecdc5c4448
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/classifier/FalsingManager.java
View File

@@ -27,6 +27,7 @@ import android.os.PowerManager;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.accessibility.AccessibilityManager;
import com.android.systemui.analytics.DataCollector; import com.android.systemui.analytics.DataCollector;
import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.StatusBarState;
@@ -60,6 +61,7 @@ public class FalsingManager implements SensorEventListener {
private final SensorManager mSensorManager; private final SensorManager mSensorManager;
private final DataCollector mDataCollector; private final DataCollector mDataCollector;
private final HumanInteractionClassifier mHumanInteractionClassifier; private final HumanInteractionClassifier mHumanInteractionClassifier;
private final AccessibilityManager mAccessibilityManager;
private static FalsingManager sInstance = null; private static FalsingManager sInstance = null;
@@ -78,7 +80,8 @@ public class FalsingManager implements SensorEventListener {
private FalsingManager(Context context) { private FalsingManager(Context context) {
mContext = context; mContext = context;
mSensorManager = (SensorManager) mContext.getSystemService(Context.SENSOR_SERVICE); mSensorManager = mContext.getSystemService(SensorManager.class);
mAccessibilityManager = context.getSystemService(AccessibilityManager.class);
mDataCollector = DataCollector.getInstance(mContext); mDataCollector = DataCollector.getInstance(mContext);
mHumanInteractionClassifier = HumanInteractionClassifier.getInstance(mContext); mHumanInteractionClassifier = HumanInteractionClassifier.getInstance(mContext);
mScreenOn = context.getSystemService(PowerManager.class).isInteractive(); mScreenOn = context.getSystemService(PowerManager.class).isInteractive();
@@ -177,6 +180,11 @@ public class FalsingManager implements SensorEventListener {
.toString()); .toString());
} }
} }
if (mAccessibilityManager.isTouchExplorationEnabled()) {
// Touch exploration triggers false positives in the classifier and
// already sufficiently prevents false unlocks.
return false;
}
return mHumanInteractionClassifier.isFalseTouch(); return mHumanInteractionClassifier.isFalseTouch();
} }