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

Commit 803dba87 authored by Albert Chen's avatar Albert Chen
Browse files

Add null check before getting vendor extension. 

Test: Compile and verify fingerprint functionality on ultrasonic UDFPS.
Bug: 302754960
Change-Id: Idf78dab6e56fc725e8062648adcc4c7fdf55fc7f
parent d73706cf

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+11 −13
Original line number Diff line number Diff line
@@ -3297,29 +3297,27 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        if (unlockPossible) {

            mFingerprintCancelSignal = new CancellationSignal();



            final FingerprintAuthenticateOptions fingerprintAuthenticateOptions =

                    new FingerprintAuthenticateOptions.Builder()

                        .setUserId(userId)

                        .build();

            if (mFingerprintInteractiveToAuthProvider != null) {

                fingerprintAuthenticateOptions.setVendorReason(

                        mFingerprintInteractiveToAuthProvider.getVendorExtension(userId));

            }



            if (!isUnlockingWithFingerprintAllowed()) {

                mLogger.v("startListeningForFingerprint - detect");

                mFpm.detectFingerprint(

                        mFingerprintCancelSignal,

                        mFingerprintDetectionCallback,

                        new FingerprintAuthenticateOptions.Builder()

                                .setUserId(userId)

                                .setVendorReason(

                                        mFingerprintInteractiveToAuthProvider.getVendorExtension(

                                                getCurrentUser()))

                                .build());

                        fingerprintAuthenticateOptions);

            } else {

                mLogger.v("startListeningForFingerprint");

                mFpm.authenticate(null /* crypto */, mFingerprintCancelSignal,

                        mFingerprintAuthenticationCallback,

                        null /* handler */,

                        new FingerprintAuthenticateOptions.Builder()

                                .setUserId(userId)

                                .setVendorReason(

                                        mFingerprintInteractiveToAuthProvider.getVendorExtension(

                                                getCurrentUser()))

                                .build()

                );

                        fingerprintAuthenticateOptions);

            }

            setFingerprintRunningState(BIOMETRIC_STATE_RUNNING);

        }