Merge "[DO NOT MERGE] Move AuthSession usage to after null check" into rvc-dev (350ffad6) · Commits · e / os / android_frameworks_base

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

+4 −4

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

		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;
		}