commit 934ff6e217d171e68f2607d5e1ca3bc1d93b896a
author Jonathan Miranda <jonmiranda@google.com> Wed Aug 30 21:49:42 2017 +0000
committer Jonathan Miranda <jonmiranda@google.com> Wed Aug 30 21:49:42 2017 +0000
tree 53ecaeb3f87912ed4030adcf2f37cb845ca72366
parent ab1c684ae82917f3d04f2503e530e73f0f8eb1fb
parent 01521b52a89500ed824f8aaa0a1f5d12fe45a75e

[automerger] Fix bug where Launcher crashes when pinned shortcut has no icon. am: 01521b52a8

Change-Id: I6c3ec09a3133d7daa20dba69b1256acbf85d38ed

src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java

diff --git a/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java b/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java
index 52abbc7..a70a9bb 100644
--- a/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java
+++ b/src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java
@@ -25,7 +25,9 @@
 import android.content.pm.ShortcutInfo;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
+import android.os.Process;
 
+import com.android.launcher3.FastBitmapDrawable;
 import com.android.launcher3.IconCache;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherAppState;
@@ -69,8 +71,12 @@
 
     @Override
     public Drawable getFullResIcon(IconCache cache) {
-        return mContext.getSystemService(LauncherApps.class)
+        Drawable d = mContext.getSystemService(LauncherApps.class)
                 .getShortcutIconDrawable(mInfo, LauncherAppState.getIDP(mContext).fillResIconDpi);
+        if (d == null) {
+            d = new FastBitmapDrawable(cache.getDefaultIcon(Process.myUserHandle()));
+        }
+        return d;
     }
 
     @Override