Merge "Ignore falsing manager for UiAutomator tests" into rvc-dev am: 7f1c80da68 (4e1eb895) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerImpl.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.systemui.classifier;

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -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_SUCCESS;

		import android.app.ActivityManager;
		import android.hardware.biometrics.BiometricSourceType;
		import android.net.Uri;
		import android.os.Build;
		@@ -190,8 +191,8 @@ public class BrightLineFalsingManager implements FalsingManager {
		return mPreviousResult;
		}

		mPreviousResult = !mJustUnlockedWithFace && !mDockManager.isDocked()
		&& mClassifiers.stream().anyMatch(falsingClassifier -> {
		mPreviousResult = !ActivityManager.isRunningInUserTestHarness() && !mJustUnlockedWithFace
		&& !mDockManager.isDocked() && mClassifiers.stream().anyMatch(falsingClassifier -> {
		boolean result = falsingClassifier.isFalseTouch();
		if (result) {
		logInfo(String.format(