commit | 1da4c747c646b40b49b6a3813cc049441e970679 | [log] [tgz] |
---|---|---|
author | Kevin Han <kevhan@google.com> | Fri Apr 17 15:39:55 2020 -0700 |
committer | Kevin Han <kevhan@google.com> | Fri Apr 17 15:39:55 2020 -0700 |
tree | 0bf3bf8568ba3aca21be9b7bcb77aef3ce497a72 | |
parent | d53e8618cc5be38e006f0949c1423ab572fddcf2 [diff] |
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
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 324bc92..fefad53 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 @@ 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 @@ return false; } - if (entry.hasJustLaunchedFullScreenIntent()) { - if (DEBUG_HEADS_UP) { - Log.d(TAG, "No alerting: recent fullscreen: " + sbn.getKey()); - } - return false; - } - return true; }