diff options
| author | Ricky Wai <rickywai@google.com> | 2015-04-15 16:39:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-15 16:39:05 +0000 |
| commit | b872be875a0d4933caef45adf6d1b1e39b9fbeed (patch) | |
| tree | d11e41e329e08f75a4939a94fda68b79033542e4 | |
| parent | 4b46ed3b425493b56d4c32b0a45f5338b2674889 (diff) | |
| parent | 3ce4625ac6d8a0ffdc50675406e98c0ad904d96a (diff) | |
| download | frameworks_base-b872be875a0d4933caef45adf6d1b1e39b9fbeed.zip frameworks_base-b872be875a0d4933caef45adf6d1b1e39b9fbeed.tar.gz frameworks_base-b872be875a0d4933caef45adf6d1b1e39b9fbeed.tar.bz2 | |
Merge "Fix ApplicationPackageManager.getDrawable() should drawable result"
| -rw-r--r-- | core/java/android/app/ApplicationPackageManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ final class ApplicationPackageManager extends PackageManager { .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); |