commit ae5e0c7b9f24564547d38a77641b120d6685dd5a
author Deepanshu Gupta <deepanshu@google.com> Tue May 13 17:40:49 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 13 17:40:49 2014 +0000
tree 5009e41f3f7812c303cd55ee9e2d0af5106a484e
parent 673d9734c2d9b62ecd41dcac3c730d242952989e
parent 4eab4e14c8453a0b41923c714a05dccdd72d7829

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

* commit '4eab4e14c8453a0b41923c714a05dccdd72d7829':
  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 6fb459c..28c6bc9 100644
--- a/core/java/com/android/internal/widget/ActionBarView.java
+++ b/core/java/com/android/internal/widget/ActionBarView.java
@@ -208,7 +208,7 @@
                     Log.e(TAG, "Activity component name not found!", e);
                 }
             }
-            if (mIcon == null) {
+            if (mIcon == null && !isInEditMode()) {
                 mIcon = appInfo.loadIcon(pm);
             }
         }