summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/popup/PopupDataProvider.java
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2017-02-01 09:58:40 -0800
committerTony Wickham <twickham@google.com>2017-02-01 09:58:40 -0800
commit4d096298ce44d9b979ca0897032421e26392ae59 (patch)
tree6f2cf8b9b11b013f41a306c08b7ce0a3e02d7f02 /src/com/android/launcher3/popup/PopupDataProvider.java
parentbdbfd5bb3a25caaa438237d1ffbf5b5f7b051521 (diff)
downloadandroid_packages_apps_Trebuchet-4d096298ce44d9b979ca0897032421e26392ae59.tar.gz
android_packages_apps_Trebuchet-4d096298ce44d9b979ca0897032421e26392ae59.tar.bz2
android_packages_apps_Trebuchet-4d096298ce44d9b979ca0897032421e26392ae59.zip
Ensure getNotificationKeysForItem() returns empty on unsupported items.
We were bypassing the check in getBadgeInfoForItem(), which meant we would return notifications based on package/user regardless of the item type. In particular, deep shortcuts would show notifications when long-pressed. Bug: 34866646 Change-Id: I6575a28539313c0c5d0eea1cbf7b7726f747bcd5
Diffstat (limited to 'src/com/android/launcher3/popup/PopupDataProvider.java')
-rw-r--r--src/com/android/launcher3/popup/PopupDataProvider.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/popup/PopupDataProvider.java b/src/com/android/launcher3/popup/PopupDataProvider.java
index c773079fe..bb9c5206b 100644
--- a/src/com/android/launcher3/popup/PopupDataProvider.java
+++ b/src/com/android/launcher3/popup/PopupDataProvider.java
@@ -148,7 +148,7 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan
}
public String[] getNotificationKeysForItem(ItemInfo info) {
- BadgeInfo badgeInfo = mPackageUserToBadgeInfos.get(PackageUserKey.fromItemInfo(info));
+ BadgeInfo badgeInfo = getBadgeInfoForItem(info);
if (badgeInfo == null) { return new String[0]; }
List<String> notificationKeys = badgeInfo.getNotificationKeys();
return notificationKeys.toArray(new String[notificationKeys.size()]);