commit 01911f3b159075b04df7fa7c93f4b73e2a8e0476
author Hyunyoung Song <hyunyoungs@google.com> Fri May 05 03:32:02 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 05 03:32:04 2017 +0000
tree 3a4800e5ce2cd7565cfe8e18a18fe233ef92c880
parent b64541af7bd6461c52eb116774ce4b778feb042e
parent 72dbc7190c1b9c158534515729c82cbfdf7534a8

Merge changes from topic 'am-b9544cab-d459-4ac3-9cb4-d75904cce3e2' into ub-launcher3-master

* changes:
  Add meta data to indicate launcher_dump provider name am: 37fa9b407b
  Add meta data to indicate launcher_dump provider name

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index c84eecb..ca9f312 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1049,7 +1049,8 @@
                                     info = c.loadSimpleShortcut();
 
                                     // Shortcuts are only available on the primary profile
-                                    if (pmHelper.isAppSuspended(targetPkg, c.user)) {
+                                    if (!TextUtils.isEmpty(targetPkg)
+                                            && pmHelper.isAppSuspended(targetPkg, c.user)) {
                                         disabledState |= ShortcutInfo.FLAG_DISABLED_SUSPENDED;
                                     }