summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Workspace.java
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2017-02-02 13:58:33 -0800
committerTony Wickham <twickham@google.com>2017-02-02 15:37:18 -0800
commit18a1b5da360fcd9b371bea2a9cbd06085c698d8c (patch)
tree2cf175b4d45bcd00d9741bd7fcc64721e37149f4 /src/com/android/launcher3/Workspace.java
parent1fafd719cb4c960448010e5fbdd8cc2634bd347d (diff)
downloadandroid_packages_apps_Trebuchet-18a1b5da360fcd9b371bea2a9cbd06085c698d8c.tar.gz
android_packages_apps_Trebuchet-18a1b5da360fcd9b371bea2a9cbd06085c698d8c.tar.bz2
android_packages_apps_Trebuchet-18a1b5da360fcd9b371bea2a9cbd06085c698d8c.zip
Gracefully ignore items that don't support notifications
PackageUserKey is only meant to be used for items that support notifications, so when trying to update it for an item that doesn't, we don't use it to check if the item has notifications. This fixes a crash that happens when trying to update notifications for a legacy shortcut, as such a shortcut doesn't have a component on its intent, which we were trying to use to populate PackageUserKey. Bug: 34842278 Change-Id: I8c69ccebbf9d93505d5b29ecd25d76c65610ddc4
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r--src/com/android/launcher3/Workspace.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index d2008a6a6..981941892 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3987,8 +3987,8 @@ public class Workspace extends PagedView
mapOverItems(MAP_RECURSE, new ItemOperator() {
@Override
public boolean evaluate(ItemInfo info, View v) {
- if (info instanceof ShortcutInfo && v instanceof BubbleTextView) {
- packageUserKey.updateFromItemInfo(info);
+ if (info instanceof ShortcutInfo && v instanceof BubbleTextView
+ && packageUserKey.updateFromItemInfo(info)) {
if (updatedBadges.contains(packageUserKey)) {
((BubbleTextView) v).applyBadgeState(info);
}