From 2a31841e3d025ee8b22b70fefea5dfc4e9e89d74 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Wed, 25 Jan 2017 14:48:26 -0800
Subject: [PATCH] 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
---
 .../systemui/statusbar/phone/NotificationPanelView.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 dfe003fd29280..228f52227b0c6 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 @@ public class NotificationPanelView extends PanelView implements
         }
         if ((!mIsExpanding || mHintAnimationRunning)
                 && !mQsExpanded
-                && mStatusBar.getBarState() != StatusBarState.SHADE) {
+                && mStatusBar.getBarState() != StatusBarState.SHADE
+                && !mDozing) {
             mAffordanceHelper.onTouchEvent(event);
         }
         if (mOnlyAffordanceInThisMotion) {