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

* commit '17e0eebdc6223de1f94b5ee538919adda9f58a9a': Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
2014-05-02 19:30:43 +00:00
parent e4fe85568b 17e0eebdc6
commit 288d32b92b
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);
            }
        }