diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2019-03-12 14:17:30 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2019-03-14 13:27:34 -0700 |
| commit | 013f062d023fa79261b58dbfc1244122fa99dd84 (patch) | |
| tree | 713cffe52654c3a303882a48635ddaa7ff374d20 /core/java/android/app/ApplicationPackageManager.java | |
| parent | 5bb71f49b3715a11a2fdffddd698deee4c2df2bc (diff) | |
ApplicationPackageManager should fetch Resource from non system context
Test: builds and manually verified on device
Test: change theme inside ThemePicker and default icon color changes
Bug: 128445995
Bug: 128447895
Change-Id: I184534c9ecea52fa381ffa6cd1e9ba53134766ca
Diffstat (limited to 'core/java/android/app/ApplicationPackageManager.java')
| -rw-r--r-- | core/java/android/app/ApplicationPackageManager.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index d3e350779c6b..bd47c9ebce3c 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -1301,8 +1301,7 @@ public class ApplicationPackageManager extends PackageManager { } @Override public Drawable getDefaultActivityIcon() { - return Resources.getSystem().getDrawable( - com.android.internal.R.drawable.sym_def_app_icon); + return mContext.getDrawable(com.android.internal.R.drawable.sym_def_app_icon); } @Override public Drawable getApplicationIcon(ApplicationInfo info) { @@ -1440,7 +1439,7 @@ public class ApplicationPackageManager extends PackageManager { if (density <= 0) { density = mContext.getResources().getDisplayMetrics().densityDpi; } - return Resources.getSystem().getDrawableForDensity(drawableId, density); + return mContext.getResources().getDrawableForDensity(drawableId, density); } private Drawable getManagedProfileIconForDensity(UserHandle user, int drawableId, int density) { |