commit 093f1098de43a376f79a9dd956117345f0fcbe3d
author Kevin Chyn <kchyn@google.com> Thu May 25 04:41:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 25 04:41:34 2017 +0000
tree b71cce3cdd028fc5cfd81f759a278cf95b787237
parent 28c86ecaf3512bfa6e9341e51d79c9c48a3f6a37
parent 23e33539cd78261ddef70058f6fb89530afbe04b

Merge "Revert fix for FingerprintManager leak" into oc-dev am: 807a8c6e7c
am: 23e33539cd

Change-Id: Iadbfa00e79d3607fe64186991f008a55ac5b05f3

core/java/android/hardware/fingerprint/FingerprintManager.java

diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java
index b00e65a..324a08c 100644
--- a/core/java/android/hardware/fingerprint/FingerprintManager.java
+++ b/core/java/android/hardware/fingerprint/FingerprintManager.java
@@ -932,7 +932,6 @@
             } else if (mAuthenticationCallback != null) {
                 mAuthenticationCallback.onAuthenticationError(clientErrMsgId,
                         getErrorString(errMsgId, vendorCode));
-                mAuthenticationCallback = null;
             } else if (mRemovalCallback != null) {
                 mRemovalCallback.onRemovalError(mRemovalFingerprint, clientErrMsgId,
                         getErrorString(errMsgId, vendorCode));
@@ -953,7 +952,6 @@
                 final AuthenticationResult result =
                         new AuthenticationResult(mCryptoObject, fp, userId);
                 mAuthenticationCallback.onAuthenticationSucceeded(result);
-                mAuthenticationCallback = null;
             }
         }