Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1ba310ca: am efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

Browse Source 
* commit '1ba310ca02eeba9281c244851e27f4fbbf3c81d6':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2014-05-13 02:00:33 +00:00
committed by Android Git Automerger
parent 06a8702729 1ba310ca02
commit 018da2e920
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/widget/ActionBarView.java
View File

@@ -207,7 +207,7 @@ public class ActionBarView extends AbsActionBarView {
Log.e(TAG, "Activity component name not found!", e); Log.e(TAG, "Activity component name not found!", e);
} }
} }
if (mIcon == null) { if (mIcon == null && !isInEditMode()) {
mIcon = appInfo.loadIcon(pm); mIcon = appInfo.loadIcon(pm);
} }
} }