Merge "Avoid NPE when mRoot is null."

2014-04-21 17:39:30 +00:00
parent 3fafb4ebf2 9ee256d252
commit 2146b91404
1 changed files with 1 additions and 1 deletions
--- 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();
        }
    }