commit 44ef4b920dca164c508fa98ef1adae7b9e0fa676
author Amin Shaikh <ashaikh@google.com> Wed May 08 13:14:22 2019 -0400
committer Amin Shaikh <ashaikh@google.com> Wed May 08 13:17:39 2019 -0400
tree ea820f2b3574281cde1508ec8bbb886c6909e9ed
parent b05638a4faa247e76c5654027ba1bc541288db1f

Use system resources for loading default icon pack

Fixes: 132013584
Test: make
Change-Id: Ifdb810c17fbd1a825be81bc32084ed4cb753ec64

src/com/android/customization/model/theme/custom/IconOptionsProvider.java

diff --git a/src/com/android/customization/model/theme/custom/IconOptionsProvider.java b/src/com/android/customization/model/theme/custom/IconOptionsProvider.java
index b977764..73a4a22 100644
--- a/src/com/android/customization/model/theme/custom/IconOptionsProvider.java
+++ b/src/com/android/customization/model/theme/custom/IconOptionsProvider.java
@@ -125,14 +125,14 @@
 
     private Drawable loadIconPreviewDrawable(String drawableName, String packageName)
             throws NameNotFoundException, NotFoundException {
-
-        Resources overlayRes = mContext.getPackageManager().getResourcesForApplication(packageName);
-        return overlayRes.getDrawable(
-                overlayRes.getIdentifier(drawableName, "drawable", packageName), null);
+        final Resources resources = ANDROID_PACKAGE.equals(packageName)
+                ? Resources.getSystem()
+                : mContext.getPackageManager().getResourcesForApplication(packageName);
+        return resources.getDrawable(
+                resources.getIdentifier(drawableName, "drawable", packageName), null);
     }
 
     private void addDefault() {
-        Resources system = Resources.getSystem();
         IconOption option = new IconOption();
         option.setLabel(mContext.getString(R.string.default_theme_title));
         try {