Merge cherrypicks of [19519111, 19347058] into tm-d1-release. (51b4a6c8) · Commits · e / os / android_frameworks_base

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -751,6 +751,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab

		private void handleFingerprintAuthFailed() {
		Assert.isMainThread();
		if (mHandler.hasCallbacks(mFpCancelNotReceived)) {
		Log.d(TAG, "handleFingerprintAuthFailed()"
		+ " triggered while waiting for cancellation, removing watchdog");
		mHandler.removeCallbacks(mFpCancelNotReceived);
		}
		for (int i = 0; i < mCallbacks.size(); i++) {
		KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
		if (cb != null) {
		@@ -781,6 +786,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab

		private void handleFingerprintAuthenticated(int authUserId, boolean isStrongBiometric) {
		Trace.beginSection("KeyGuardUpdateMonitor#handlerFingerPrintAuthenticated");
		if (mHandler.hasCallbacks(mFpCancelNotReceived)) {
		Log.d(TAG, "handleFingerprintAuthenticated()"
		+ " triggered while waiting for cancellation, removing watchdog");
		mHandler.removeCallbacks(mFpCancelNotReceived);
		}
		try {
		final int userId;
		try {

+1 −0

Original line number	Diff line number	Diff line
		@@ -160,6 +160,7 @@ public class Watchdog implements Dumpable {
		public static final String[] AIDL_INTERFACE_PREFIXES_OF_INTEREST = new String[] {
		"android.hardware.biometrics.face.IFace/",
		"android.hardware.biometrics.fingerprint.IFingerprint/",
		"android.hardware.graphics.composer3.IComposer/",
		"android.hardware.input.processor.IInputProcessor/",
		"android.hardware.light.ILights/",
		"android.hardware.power.IPower/",