From 9ee256d2522f5ab779dfab65c6d1f389b5ddb59a Mon Sep 17 00:00:00 2001 From: Dan Sandler Date: Mon, 21 Apr 2014 12:05:00 -0400 Subject: Avoid NPE when mRoot is null. Bug: 14162288 Change-Id: I36793d706ab1d29576f536562a0c06f7805a0d50 --- .../src/com/android/systemui/statusbar/phone/KeyguardBouncer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java index f2054a2..cf31b44 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java @@ -83,7 +83,7 @@ public class KeyguardBouncer { } public void onScreenTurnedOff() { - if (mKeyguardView != null && mRoot.getVisibility() == View.VISIBLE) { + if (mKeyguardView != null && mRoot != null && mRoot.getVisibility() == View.VISIBLE) { mKeyguardView.onPause(); } } -- cgit v1.1