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

Merge "Ignore falsing manager for UiAutomator tests" into rvc-dev

Browse Source
This commit is contained in:
Lucas Dupin
2020-02-29 21:12:59 +00:00
committed by Android (Google) Code Review
parent dabdc31ad1 13b8cec66f
commit 7f1c80da68
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerImpl.java
View File

@@ -16,6 +16,7 @@
package com.android.systemui.classifier; package com.android.systemui.classifier;
import android.app.ActivityManager;
import android.content.Context; import android.content.Context;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.hardware.Sensor; import android.hardware.Sensor;
@@ -296,6 +297,10 @@ public class FalsingManagerImpl implements FalsingManager {
mHandler.postDelayed(mPendingWtf, 1000); mHandler.postDelayed(mPendingWtf, 1000);
} }
} }
if (ActivityManager.isRunningInUserTestHarness()) {
// This is a test device running UiAutomator code.
return false;
}
if (mAccessibilityManager.isTouchExplorationEnabled()) { if (mAccessibilityManager.isTouchExplorationEnabled()) {
// Touch exploration triggers false positives in the classifier and // Touch exploration triggers false positives in the classifier and
// already sufficiently prevents false unlocks. // already sufficiently prevents false unlocks.

5
packages/SystemUI/src/com/android/systemui/classifier/brightline/BrightLineFalsingManager.java
View File

@@ -19,6 +19,7 @@ package com.android.systemui.classifier.brightline;
import static com.android.systemui.classifier.FalsingManagerImpl.FALSING_REMAIN_LOCKED; import static com.android.systemui.classifier.FalsingManagerImpl.FALSING_REMAIN_LOCKED;
import static com.android.systemui.classifier.FalsingManagerImpl.FALSING_SUCCESS; import static com.android.systemui.classifier.FalsingManagerImpl.FALSING_SUCCESS;
import android.app.ActivityManager;
import android.hardware.biometrics.BiometricSourceType; import android.hardware.biometrics.BiometricSourceType;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
@@ -190,8 +191,8 @@ public class BrightLineFalsingManager implements FalsingManager {
return mPreviousResult; return mPreviousResult;
} }
mPreviousResult = !mJustUnlockedWithFace && !mDockManager.isDocked() mPreviousResult = !ActivityManager.isRunningInUserTestHarness() && !mJustUnlockedWithFace
&& mClassifiers.stream().anyMatch(falsingClassifier -> { && !mDockManager.isDocked() && mClassifiers.stream().anyMatch(falsingClassifier -> {
boolean result = falsingClassifier.isFalseTouch(); boolean result = falsingClassifier.isFalseTouch();
if (result) { if (result) {
logInfo(String.format( logInfo(String.format(