From ff7364a8837cf228b936555745dea7ba1648a214 Mon Sep 17 00:00:00 2001
From: Tony <twickham@google.com>
Date: Mon, 13 Mar 2017 12:51:44 -0400
Subject: [PATCH] Remove badge info from map when count is 0.

Bug: 35803112
Change-Id: I680b92aac24bf5d083d64e9a4cd35471637a3809
---
 src/com/android/launcher3/popup/PopupDataProvider.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/launcher3/popup/PopupDataProvider.java b/src/com/android/launcher3/popup/PopupDataProvider.java
index ee2930f19..f0ccb1bb6 100644
--- a/src/com/android/launcher3/popup/PopupDataProvider.java
+++ b/src/com/android/launcher3/popup/PopupDataProvider.java
@@ -75,6 +75,9 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan
             notificationWasAddedOrRemoved = shouldBeFilteredOut
                     ? badgeInfo.removeNotificationKey(notificationKey)
                     : badgeInfo.addNotificationKeyIfNotExists(notificationKey);
+            if (badgeInfo.getNotificationCount() == 0) {
+                mPackageUserToBadgeInfos.remove(postedPackageUserKey);
+            }
         }
         updateLauncherIconBadges(Utilities.singletonHashSet(postedPackageUserKey),
                 notificationWasAddedOrRemoved);
-- 
2.11.0