Merge "Check for UDFPS finger down for face auth device entry" into tm-d1-dev (bf6c65b9) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+0 −22

Original line number	Diff line number	Diff line
		@@ -1571,9 +1571,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		public void onUdfpsPointerDown(int sensorId) {
		Log.d(TAG, "onUdfpsPointerDown, sensorId: " + sensorId);
		requestFaceAuth(true);
		if (isFaceDetectionRunning()) {
		mKeyguardBypassController.setUserHasDeviceEntryIntent(true);
		}
		}

		/**
		@@ -1606,9 +1603,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		"faceFailure-" + reason);

		handleFaceAuthFailed();
		if (mKeyguardBypassController != null) {
		mKeyguardBypassController.setUserHasDeviceEntryIntent(false);
		}
		}

		@Override
		@@ -1616,10 +1610,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		Trace.beginSection("KeyguardUpdateMonitor#onAuthenticationSucceeded");
		handleFaceAuthenticated(result.getUserId(), result.isStrongBiometric());
		Trace.endSection();

		if (mKeyguardBypassController != null) {
		mKeyguardBypassController.setUserHasDeviceEntryIntent(false);
		}
		}

		@Override
		@@ -1630,9 +1620,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		@Override
		public void onAuthenticationError(int errMsgId, CharSequence errString) {
		handleFaceError(errMsgId, errString.toString());
		if (mKeyguardBypassController != null) {
		mKeyguardBypassController.setUserHasDeviceEntryIntent(false);
		}

		if (mActiveUnlockConfig.shouldRequestActiveUnlockOnFaceError(errMsgId)) {
		requestActiveUnlock(
		@@ -2315,10 +2302,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		updateFaceListeningState(BIOMETRIC_ACTION_START);
		}

		public boolean isFaceAuthUserRequested() {
		return mIsFaceAuthUserRequested;
		}

		/**
		* In case face auth is running, cancel it.
		*/
		@@ -3179,11 +3162,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		mSecureCameraLaunched = false;
		}

		if (mKeyguardBypassController != null) {
		// LS visibility has changed, so reset deviceEntryIntent
		mKeyguardBypassController.setUserHasDeviceEntryIntent(false);
		}

		for (int i = 0; i < mCallbacks.size(); i++) {
		KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
		if (cb != null) {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -582,7 +582,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
		mUpdateMonitor.isUnlockingWithBiometricAllowed(isStrongBiometric);
		boolean deviceDreaming = mUpdateMonitor.isDreaming();
		boolean bypass = mKeyguardBypassController.getBypassEnabled()
		\|\| mKeyguardBypassController.getUserHasDeviceEntryIntent();
		\|\| mAuthController.isUdfpsFingerDown();
		if (!mUpdateMonitor.isDeviceInteractive()) {
		if (!mKeyguardViewController.isShowing()) {
		return bypass ? MODE_WAKE_AND_UNLOCK : MODE_ONLY_WAKE;

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ open class KeyguardBypassController : Dumpable, StackScrollAlgorithm.BypassContr
		private var hasFaceFeature: Boolean
		private var pendingUnlock: PendingUnlock? = null
		private val listeners = mutableListOf<OnBypassStateChangedListener>()
		var userHasDeviceEntryIntent: Boolean = false // ie: attempted udfps auth

		private val faceAuthEnabledChangedCallback = object : KeyguardStateController.Callback {
		override fun onFaceAuthEnabledChanged() = notifyListeners()
		@@ -217,7 +216,6 @@ open class KeyguardBypassController : Dumpable, StackScrollAlgorithm.BypassContr
		pw.println(" launchingAffordance: $launchingAffordance")
		pw.println(" qSExpanded: $qSExpanded")
		pw.println(" hasFaceFeature: $hasFaceFeature")
		pw.println(" userHasDeviceEntryIntent: $userHasDeviceEntryIntent")
		}

		/** Registers a listener for bypass state changes. */