commit 350ffad64f0f1263c66224251699ffa3ed746ee5
author Kevin Chyn <kchyn@google.com> Sat Jun 27 03:10:47 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 27 03:10:47 2020 +0000
tree 188598c08b0af73a8809aa1e06ff914f208e143a
parent 0bea1417173eab13e5e3faac6d40f70e0f40b3ff
parent ee88f23c613bd22e06f958d3ec864ab33ea962aa

Merge "[DO NOT MERGE] Move AuthSession usage to after null check" into rvc-dev

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

diff --git a/services/core/java/com/android/server/biometrics/BiometricService.java b/services/core/java/com/android/server/biometrics/BiometricService.java
index 540c6ff..1217a50 100644
--- a/services/core/java/com/android/server/biometrics/BiometricService.java
+++ b/services/core/java/com/android/server/biometrics/BiometricService.java
@@ -1630,15 +1630,15 @@
     }
 
     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) {
             Slog.e(TAG, "Auth session null");
             return;
         }
 
+        final boolean shouldReceive = mCurrentAuthSession.mBundle
+                .getBoolean(BiometricPrompt.KEY_RECEIVE_SYSTEM_EVENTS, false);
+        Slog.d(TAG, "onSystemEvent: " + event + ", shouldReceive: " + shouldReceive);
+
         if (!shouldReceive) {
             return;
         }