am 465cb53b: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

* commit '465cb53ba4b4a5edff9e9a63eb97d396b94d6568': Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
2014-05-02 19:24:00 +00:00
parent bb1d24d7c7 465cb53ba4
commit 17e0eebdc6
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
@@ -212,7 +212,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);
            }
        }