commit 980e5b5869269e6aee4d41e7efda70af3465d086
author Kevin Chyn <kchyn@google.com> Wed Oct 04 00:31:28 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 04 00:31:28 2017 +0000
tree d222b10c491b3056f7ba3333b49a4538d575b057
parent 57c5fe9b8d9a7616d8afe6007aa0ad8178f3e7e0
parent 9c8739c8e124212a211c0fea96524d8aadbbfced

Merge "Fix logic error / possible NPE in AuthenticationSidecar"

src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java

diff --git a/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java b/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java
index b419b72..d649c0b 100644
--- a/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java
+++ b/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java
@@ -117,12 +117,12 @@
     public void setListener(Listener listener) {
         if (mListener == null && listener != null) {
             if (mAuthenticationResult != null) {
-                mListener.onAuthenticationSucceeded(mAuthenticationResult);
+                listener.onAuthenticationSucceeded(mAuthenticationResult);
                 mAuthenticationResult = null;
             }
             if (mAuthenticationError != null &&
                     mAuthenticationError.error != FingerprintManager.FINGERPRINT_ERROR_CANCELED) {
-                mListener.onAuthenticationError(mAuthenticationError.error,
+                listener.onAuthenticationError(mAuthenticationError.error,
                         mAuthenticationError.errorString);
                 mAuthenticationError = null;
             }