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

am: 23e33539cd Change-Id: Iadbfa00e79d3607fe64186991f008a55ac5b05f3
2017-05-25 04:41:34 +00:00
parent 28c86ecaf3 23e33539cd
commit 093f1098de
1 changed files with 0 additions and 2 deletions
--- a/core/java/android/hardware/fingerprint/FingerprintManager.java
+++ b/core/java/android/hardware/fingerprint/FingerprintManager.java
@@ -932,7 +932,6 @@ public class FingerprintManager {
            } 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 @@ public class FingerprintManager {
                final AuthenticationResult result =
                        new AuthenticationResult(mCryptoObject, fp, userId);
                mAuthenticationCallback.onAuthenticationSucceeded(result);
-                mAuthenticationCallback = null;
            }
        }