summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matt Pietal <mpietal@google.com> 2025-01-02 22:07:27 +0000
committer Matt Pietal <mpietal@google.com> 2025-01-02 14:10:17 -0800
commit94df6176ed4fe1e394743fc19e133a78bec2a8c9 (patch)
tree35e382af53360f1387a99550e17e125ee8fb9f27
parentd08c5650bd4f509a772910e79fd182f14a0f8b30 (diff)
Add NPE check around live data
Fixes: 385386678 Test: manual Flag: EXEMPT bugfix Change-Id: I85d868fb0d6588af16355e2fe097161699c39123
-rw-r--r--packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java
index 42460617d476..a8de43332556 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java
@@ -140,7 +140,7 @@ public class KeyguardSliceViewController extends ViewController<KeyguardSliceVie
@Override
protected void onViewDetached() {
// TODO(b/117344873) Remove below work around after this issue be fixed.
- if (mDisplayId == mDisplayTracker.getDefaultDisplayId()) {
+ if (mDisplayId == mDisplayTracker.getDefaultDisplayId() && mLiveData != null) {
mLiveData.removeObserver(mObserver);
}
mConfigurationController.removeCallback(mConfigurationListener);