| commit | d70e0c33d0b29df0e1f1386852f6ebca3b454d62 | [log] [tgz] |
|---|---|---|
| author | Grace Cheng <graciecheng@google.com> | Thu Mar 16 20:19:46 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 16 20:19:46 2023 +0000 |
| tree | a2345a44ce6eb6ca7427a089792572ae783963e6 | |
| parent | 79b8e4c381aeec405e4881eee891a256bbdd9cc8 [diff] | |
| parent | 92cd3305dd5427aecd840c0783144384613333da [diff] |
Merge "Add null check in AuthBiometricView#onConfigurationChange" into tm-qpr-dev am: fb599cdf14 am: 92cd3305dd Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22091893 Change-Id: I8ce5f8ab10948cb90dbce1b99e6cdfb4062af336 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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