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

Commit cd49d9b6 authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

[DO NOT MERGE] Move AuthSession usage to after null check am: ee88f23c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12013474

Change-Id: I872ff099a0f9d1653106a38924d33612ceb585db
parents 79152314 ee88f23c

services/core/java/com/android/server/biometrics/BiometricService.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -1630,15 +1630,15 @@ public class BiometricService extends SystemService { 
    }

    }





    private void handleOnSystemEvent(int event) {

    private void handleOnSystemEvent(int event) {

        final boolean shouldReceive = mCurrentAuthSession.mBundle

                .getBoolean(BiometricPrompt.KEY_RECEIVE_SYSTEM_EVENTS, false);

        Slog.d(TAG, "onSystemEvent: " + event + ", shouldReceive: " + shouldReceive);



        if (mCurrentAuthSession == null) {

        if (mCurrentAuthSession == null) {

            Slog.e(TAG, "Auth session null");

            Slog.e(TAG, "Auth session null");

            return;

            return;

        }

        }





        final boolean shouldReceive = mCurrentAuthSession.mBundle

                .getBoolean(BiometricPrompt.KEY_RECEIVE_SYSTEM_EVENTS, false);

        Slog.d(TAG, "onSystemEvent: " + event + ", shouldReceive: " + shouldReceive);



        if (!shouldReceive) {

        if (!shouldReceive) {

            return;

            return;

        }

        }