commit ebd909cca1f69028878f15e6fb0ece6e8c8da584
author Deepanshu Gupta <deepanshu@google.com> Tue May 13 17:42:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 13 17:42:03 2014 +0000
tree dde9ec590d1163b6768def5f954636834f136448
parent b161d6ba7f85b49e4e19d69bd107d30cdd3c0bc1
parent ae5e0c7b9f24564547d38a77641b120d6685dd5a

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]

core/java/com/android/internal/widget/ActionBarView.java

diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java
index 0f964b9..534e034 100644
--- a/core/java/com/android/internal/widget/ActionBarView.java
+++ b/core/java/com/android/internal/widget/ActionBarView.java
@@ -207,7 +207,7 @@
                     Log.e(TAG, "Activity component name not found!", e);
                 }
             }
-            if (mIcon == null) {
+            if (mIcon == null && !isInEditMode()) {
                 mIcon = appInfo.loadIcon(pm);
             }
         }