summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Grace Cheng <graciecheng@google.com> 2023-03-16 18:57:03 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-03-16 18:57:03 +0000
commitfb599cdf140ccf6d8df69b56f3c25779b8ea2ac6 (patch)
tree12f5d5ee113ce0f3ea96fa1a52f67b1cc1322fc4
parent16685036c752c6e3d33cf43e3dba2d2feccf5753 (diff)
parent26030b9e2226bfe62a2335c3c9705cf8b08d94b4 (diff)
Merge "Add null check in AuthBiometricView#onConfigurationChange" into tm-qpr-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java
index a7b6e6ae6d40..13bb6d345dbd 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