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

* commit '1ba310ca02eeba9281c244851e27f4fbbf3c81d6': Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
2014-05-13 02:00:33 +00:00
parent 06a8702729 1ba310ca02
commit 018da2e920
1 changed files with 1 additions and 1 deletions
--- a/core/java/com/android/internal/widget/ActionBarView.java
+++ b/core/java/com/android/internal/widget/ActionBarView.java
@@ -207,7 +207,7 @@ public class ActionBarView extends AbsActionBarView {
                    Log.e(TAG, "Activity component name not found!", e);
                }
            }
-            if (mIcon == null) {
+            if (mIcon == null && !isInEditMode()) {
                mIcon = appInfo.loadIcon(pm);
            }
        }