commit a2f29e6dbb1c10d96052625a8fdcd83baa4287d2
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 16 20:21:28 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 16 20:21:28 2023 +0000
tree 18e8ba319fe0390ef0029935a0f56b227a376cb0
parent 86be3d22872fab8d0df9ba82c02495a16b6e5f54
parent d70e0c33d0b29df0e1f1386852f6ebca3b454d62

Merge "Merge "Add null check in AuthBiometricView#onConfigurationChange" into tm-qpr-dev am: fb599cdf14 am: 92cd3305dd" into udc-dev

packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java

diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java
index a7b6e6a..13bb6d3 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 @@
     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