am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

* commit '5268248e0708951966e4f6514736a4030d5052da': Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
2014-05-13 02:20:47 +00:00
parent 00d0964901 5268248e07
commit 4eab4e14c8
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);
            }
        }