summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kevin Chyn <kchyn@google.com> 2017-05-25 04:28:09 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-05-25 04:28:14 +0000
commit807a8c6e7ca08c824a1cb97b60bad2a1fccd57b8 (patch)
tree3d805738e0c4fbb29a6983095a7b3fda9c97b725
parente736807efddf27a4d2bf462f1923078ed0a7b6b6 (diff)
parent5e797faaf4854e1665f09d422b1921d89a928d97 (diff)
Merge "Revert fix for FingerprintManager leak" into oc-dev
-rw-r--r--core/java/android/hardware/fingerprint/FingerprintManager.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java
index b00e65a24fb7..324a08ca9e1b 100644
--- 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;
}
}