diff options
| author | Scott Mertz <scott@cyngn.com> | 2016-05-20 16:29:48 -0700 |
|---|---|---|
| committer | Scott Mertz <scott@cyngn.com> | 2016-05-20 16:32:41 -0700 |
| commit | 4855c261789a7871377b454590126699c8945ff0 (patch) | |
| tree | 5a4af70c26c941f45ef82cbbe54a6f378ba1fbe7 | |
| parent | 7a3ef4f88997118ffb5b1527e8c9635ffca75893 (diff) | |
| download | frameworks_base-4855c261789a7871377b454590126699c8945ff0.zip frameworks_base-4855c261789a7871377b454590126699c8945ff0.tar.gz frameworks_base-4855c261789a7871377b454590126699c8945ff0.tar.bz2 | |
SystemUI: fix NPE when configuring blur layer
I noticed a NPE on my device with OOB encryption & password lockscreen
(no password required to boot). This fixes it.
FEIJ-753
Change-Id: I303354e94be451ab65deb815ecf39cda9d6a339e
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java index fc2d638..b96411d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java @@ -148,7 +148,7 @@ public class StatusBarWindowManager implements KeyguardMonitor.Callback { } else { mLpChanged.flags &= ~WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER; mLpChanged.privateFlags &= ~WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD; - if (mKeyguardBlurEnabled) { + if (mKeyguardBlurEnabled && mKeyguardBlur != null) { mKeyguardBlur.hide(); } } |