commit 9ee256d2522f5ab779dfab65c6d1f389b5ddb59a
author Dan Sandler <dsandler@android.com> Mon Apr 21 12:05:00 2014 -0400
committer Dan Sandler <dsandler@android.com> Mon Apr 21 17:34:49 2014 +0000
tree 9a7a297952f82a9e54bdb73c867902ff8ad3e2b0
parent 06661993037c28d2e189bfe809304a5d0e3ba5d8

Avoid NPE when mRoot is null.

Bug: 14162288
Change-Id: I36793d706ab1d29576f536562a0c06f7805a0d50

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java

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 void onScreenTurnedOff() {
-        if (mKeyguardView != null && mRoot.getVisibility() == View.VISIBLE) {
+        if (mKeyguardView != null && mRoot != null && mRoot.getVisibility() == View.VISIBLE) {
             mKeyguardView.onPause();
         }
     }