commit 2a31841e3d025ee8b22b70fefea5dfc4e9e89d74
author Adrian Roos <roosa@google.com> Wed Jan 25 14:48:26 2017 -0800
committer Adrian Roos <roosa@google.com> Wed Jan 25 14:50:01 2017 -0800
tree f1d7f9180339b3577b565e71dfd5784a5c8d9d0e
parent e31f30e946465dca24b264ddbd3a83565faeae8e

AOD: Prevent KeyguardAffordanceViews from triggering in doze

Fixes a bug where the the affordances on the keyguard could
be triggered on Ambient Display even though they were invisible.

Fixes: 34707183
Test: Enter Ambient Display, drag from bottom right corner. Nothing should happen.
Change-Id: I2deab6d006b645670038d7f658fb0361618b3a91

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index dfe003f..228f522 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -762,7 +762,8 @@
         }
         if ((!mIsExpanding || mHintAnimationRunning)
                 && !mQsExpanded
-                && mStatusBar.getBarState() != StatusBarState.SHADE) {
+                && mStatusBar.getBarState() != StatusBarState.SHADE
+                && !mDozing) {
             mAffordanceHelper.onTouchEvent(event);
         }
         if (mOnlyAffordanceInThisMotion) {