commit 3ce4625ac6d8a0ffdc50675406e98c0ad904d96a
author Ricky Wai <rickywai@google.com> Wed Apr 15 16:12:22 2015 +0100
committer Ricky Wai <rickywai@google.com> Wed Apr 15 16:38:19 2015 +0000
tree 28686701280118aa82e8621e0f15c473bccfaec0
parent 7526611f51f3fb0aba74a79fc48f329bb8d02559

Fix ApplicationPackageManager.getDrawable() should drawable result

Bug: 20247312
Change-Id: I6cec3bac794006e41ca85035c572843c92938517

core/java/android/app/ApplicationPackageManager.java

diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java
index 907ae26..fe6e4f3 100644
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -771,10 +771,12 @@
                                     .getCompatibilityInfo().applicationScale,
                             e);
                 }
-                if (DEBUG_ICONS)
+                if (DEBUG_ICONS) {
                     Log.v(TAG, "Getting drawable 0x"
                             + Integer.toHexString(resId) + " from " + r
                             + ": " + dr);
+                }
+                return dr;
             } catch (NameNotFoundException e) {
                 Log.w("PackageManager", "Failure retrieving resources for "
                         + appInfo.packageName);