Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23e33539 authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

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

am: 807a8c6e

Change-Id: I9f9132b1785c4e7c7d04dcc7decfbc4e447fbdd0
parents b150a39b 807a8c6e

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

+0 −2
Original line number Diff line number Diff line
@@ -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;

            }

        }