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

Commit c7e24fd3 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Move null check"

parents f2497e52 ffef714c

core/java/android/hardware/face/FaceManager.java

+1 −4
Original line number Diff line number Diff line
@@ -975,14 +975,11 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
            mAuthenticationCallback.onAuthenticationAcquired(acquireInfo);

        }

        final String msg = getAcquiredString(mContext, acquireInfo, vendorCode);

        if (msg == null) {

            return;

        }

        final int clientInfo = acquireInfo == FACE_ACQUIRED_VENDOR

                ? (vendorCode + FACE_ACQUIRED_VENDOR_BASE) : acquireInfo;

        if (mEnrollmentCallback != null) {

            mEnrollmentCallback.onEnrollmentHelp(clientInfo, msg);

        } else if (mAuthenticationCallback != null) {

        } else if (mAuthenticationCallback != null && msg != null) {

            mAuthenticationCallback.onAuthenticationHelp(clientInfo, msg);

        }

    }