From 958315e8ef448641a75401acff1e4cb38fd776e7 Mon Sep 17 00:00:00 2001 From: Kenny Guy Date: Tue, 27 May 2014 16:34:59 +0100 Subject: [PATCH] Add catch for missing app icon resource. The catch was present before moving the code into the compat class. Bug: 15276879 Change-Id: I81fbd49dacd813e861a2bc4f0b41dcbeccb9def2 (cherry picked from commit c879052247b1000b9f318294024daa3c9d100621) --- .../launcher3/compat/LauncherActivityInfoCompatV16.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java b/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java index 9b9384d832..052d4343ec 100644 --- a/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java +++ b/src/com/android/launcher3/compat/LauncherActivityInfoCompatV16.java @@ -61,7 +61,11 @@ public class LauncherActivityInfoCompatV16 extends LauncherActivityInfoCompat { resources = null; } if (resources != null) { - d = resources.getDrawableForDensity(mActivityInfo.getIconResource(), density); + try { + d = resources.getDrawableForDensity(mActivityInfo.getIconResource(), density); + } catch (Resources.NotFoundException e) { + // Return default icon below. + } } } if (d == null) {