Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 507f19c8 authored May 12, 2022 by Joshua Mccloskey Committed by Automerger Merge Worker May 12, 2022

Merge "ResetLockoutClients cancel preceding clients." into tm-dev am: fa8e422f am: 3057d5fb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18309972

Change-Id: I87d65d7071583bf17be4948d23b34afcd171aaf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents e25205df 3057d5fb

services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceResetLockoutClient.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,10 @@ public class FaceResetLockoutClient extends HalClientMonitor<AidlSession> implem
		mCallback.onClientFinished(this, true /* success */);
		}

		public boolean interruptsPrecedingClients() {
		return true;
		}

		/**
		* Reset the local lockout state and notify any listeners.
		*

services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceResetLockoutClient.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,10 @@ public class FaceResetLockoutClient extends HalClientMonitor<IBiometricsFace> {
		startHalOperation();
		}

		public boolean interruptsPrecedingClients() {
		return true;
		}

		@Override
		protected void startHalOperation() {
		try {

services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintResetLockoutClient.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,10 @@ class FingerprintResetLockoutClient extends HalClientMonitor<AidlSession> implem
		}
		}

		public boolean interruptsPrecedingClients() {
		return true;
		}

		void onLockoutCleared() {
		resetLocalLockoutStateToNone(getSensorId(), getTargetUserId(), mLockoutCache,
		mLockoutResetDispatcher);

services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintResetLockoutClient.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,10 @@ public class FingerprintResetLockoutClient extends BaseClientMonitor {
		callback.onClientFinished(this, true /* success */);
		}

		public boolean interruptsPrecedingClients() {
		return true;
		}

		@Override
		public int getProtoEnum() {
		return BiometricsProto.CM_RESET_LOCKOUT;