Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 807a8c6e7c

Change-Id: I9f9132b1785c4e7c7d04dcc7decfbc4e447fbdd0
This commit is contained in:
Kevin Chyn
2017-05-25 04:33:07 +00:00
committed by android-build-merger
parent b150a39b0f 807a8c6e7c
commit 23e33539cd
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/hardware/fingerprint/FingerprintManager.java
View File

@@ -932,7 +932,6 @@ public class FingerprintManager {
} else if (mAuthenticationCallback != null) { } else if (mAuthenticationCallback != null) {
mAuthenticationCallback.onAuthenticationError(clientErrMsgId, mAuthenticationCallback.onAuthenticationError(clientErrMsgId,
getErrorString(errMsgId, vendorCode)); getErrorString(errMsgId, vendorCode));
mAuthenticationCallback = null;
} else if (mRemovalCallback != null) { } else if (mRemovalCallback != null) {
mRemovalCallback.onRemovalError(mRemovalFingerprint, clientErrMsgId, mRemovalCallback.onRemovalError(mRemovalFingerprint, clientErrMsgId,
getErrorString(errMsgId, vendorCode)); getErrorString(errMsgId, vendorCode));
@@ -953,7 +952,6 @@ public class FingerprintManager {
final AuthenticationResult result = final AuthenticationResult result =
new AuthenticationResult(mCryptoObject, fp, userId); new AuthenticationResult(mCryptoObject, fp, userId);
mAuthenticationCallback.onAuthenticationSucceeded(result); mAuthenticationCallback.onAuthenticationSucceeded(result);
mAuthenticationCallback = null;
} }
} }