summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2016-10-18 16:59:24 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-10-18 16:59:27 +0000
commitfe7cab60424b0d64d10f3fea6aaf236109b58d14 (patch)
tree4f5ced22bf8940395884a62eaa7826a98f36e947
parent92bd012829e57c5ac0560a6bdd4ef0776125de90 (diff)
parentb22665db0cd0f2ae85ef9e80d6086aadb166248b (diff)
Merge "DirectReply: fix lockscreen crash" into nyc-mr1-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 1d91346673c3..30613bc76e49 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -4231,7 +4231,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
}
updateKeyguardState(staying, false /* fromShadeLocked */);
- if (viewToClick != null) {
+ if (viewToClick != null && viewToClick.isAttachedToWindow()) {
viewToClick.callOnClick();
}