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

* commit '90ce58ecfdf7231611d70c849f14e5e71d1c8220': Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
2014-05-13 01:50:00 +00:00
parent b7bafba7c6 90ce58ecfd
commit efa5ffc883
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);
            }
        }