From 1da4c747c646b40b49b6a3813cc049441e970679 Mon Sep 17 00:00:00 2001
From: Kevin Han <kevhan@google.com>
Date: Fri, 17 Apr 2020 15:39:55 -0700
Subject: [PATCH] Don't allow HUNs during dozing fullscreen intents

Move check preventing HUN from canAlertCommonWake to canAlertCommon so
that we dont HUN while a fullscreen intent is active.

Bug: 153705384
Test: repro in bug does not cause HUN
Change-Id: I3e520621027d53da44556e925f21756bea8eac5b
---
 .../NotificationInterruptStateProviderImpl.java   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java
index 324bc923fb354..fefad531377fb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java
@@ -336,6 +336,14 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter
                 return false;
             }
         }
+
+        if (entry.hasJustLaunchedFullScreenIntent()) {
+            if (DEBUG_HEADS_UP) {
+                Log.d(TAG, "No alerting: recent fullscreen: " + sbn.getKey());
+            }
+            return false;
+        }
+
         return true;
     }
 
@@ -365,13 +373,6 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter
             return false;
         }
 
-        if (entry.hasJustLaunchedFullScreenIntent()) {
-            if (DEBUG_HEADS_UP) {
-                Log.d(TAG, "No alerting: recent fullscreen: " + sbn.getKey());
-            }
-            return false;
-        }
-
         return true;
     }