commit 807a8c6e7ca08c824a1cb97b60bad2a1fccd57b8
author Kevin Chyn <kchyn@google.com> Thu May 25 04:28:09 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 25 04:28:14 2017 +0000
tree 3d805738e0c4fbb29a6983095a7b3fda9c97b725
parent e736807efddf27a4d2bf462f1923078ed0a7b6b6
parent 5e797faaf4854e1665f09d422b1921d89a928d97

Merge "Revert fix for FingerprintManager leak" into oc-dev

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;
             }
         }