diff options
| author | Dan Sandler <dsandler@android.com> | 2014-04-21 17:39:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-21 17:39:31 +0000 |
| commit | 2146b91404bfe8274bb8b37bfea1d9b8059cdd12 (patch) | |
| tree | c429aebbffb252569441d46fdb16b9227bf04612 | |
| parent | 3fafb4ebf2572578c6d7df742593ee5ed17748a8 (diff) | |
| parent | 9ee256d2522f5ab779dfab65c6d1f389b5ddb59a (diff) | |
| download | frameworks_base-2146b91404bfe8274bb8b37bfea1d9b8059cdd12.zip frameworks_base-2146b91404bfe8274bb8b37bfea1d9b8059cdd12.tar.gz frameworks_base-2146b91404bfe8274bb8b37bfea1d9b8059cdd12.tar.bz2 | |
Merge "Avoid NPE when mRoot is null."
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java | 2 |
1 files changed, 1 insertions, 1 deletions
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(); } } |