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

* commit 'ae5e0c7b9f24564547d38a77641b120d6685dd5a': Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
2014-05-13 17:42:03 +00:00
parent b161d6ba7f ae5e0c7b9f
commit ebd909cca1
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);
            }
        }