From 26030b9e2226bfe62a2335c3c9705cf8b08d94b4 Mon Sep 17 00:00:00 2001
From: Grace Cheng <graciecheng@google.com>
Date: Wed, 15 Mar 2023 07:09:45 +0000
Subject: [PATCH] Add null check in AuthBiometricView#onConfigurationChange

Add null check for retrieving saved state on configuration changes

Test: (manual) do repro steps on bug, verify no crash
Fixes: 271527985
Change-Id: I43630549e5d4fa49b8a9e5c1bc8c8b1c067ee2af
---
 .../com/android/systemui/biometrics/AuthBiometricView.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java
index a7b6e6ae6d406..13bb6d345dbd5 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java
@@ -658,7 +658,9 @@ public abstract class AuthBiometricView extends LinearLayout {
     protected void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
         mIconController.onConfigurationChanged(newConfig);
-        updateState(mSavedState.getInt(AuthDialog.KEY_BIOMETRIC_STATE));
+        if (mSavedState != null) {
+            updateState(mSavedState.getInt(AuthDialog.KEY_BIOMETRIC_STATE));
+        }
     }
 
     @Override