From e211f57e2a86ff1da81d7ee969b7148cb43db43f Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Fri, 8 Apr 2016 14:24:20 -0700
Subject: [PATCH] Keep HUNs that have an active remote input

Fixes: 28043709
Change-Id: I6dc4d0baecf2d1f6fe64071ef7591d4024911524
---
 .../android/systemui/statusbar/policy/HeadsUpManager.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java
index ab817127564c7..d10a61c1e8852 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java
@@ -669,6 +669,13 @@ public class HeadsUpManager implements ViewTreeObserver.OnComputeInternalInsetsL
             } else if (!selfFullscreen && otherFullscreen) {
                 return 1;
             }
+
+            if (remoteInputActive && !o.remoteInputActive) {
+                return -1;
+            } else if (!remoteInputActive && o.remoteInputActive) {
+                return 1;
+            }
+
             return postTime < o.postTime ? 1
                     : postTime == o.postTime ? entry.key.compareTo(o.entry.key)
                             : -1;