commit 465cb53ba4b4a5edff9e9a63eb97d396b94d6568
author Deepanshu Gupta <deepanshu@google.com> Fri Apr 25 20:47:16 2014 -0700
committer Deepanshu Gupta <deepanshu@google.com> Fri Apr 25 20:48:46 2014 -0700
tree 180870e81319c2263d6810fbd0502219cf39259c
parent b5cdfd97a5bbc2c52dec907467362550aff8afc4

Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

When running in edit mode, do not use the application info to get the
icon, since it will be null.

Change-Id: I174e6126ddca341d06c5f04939470ef52f0e771c

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 dda1a10..b9b6ee5 100644
--- a/core/java/com/android/internal/widget/ActionBarView.java
+++ b/core/java/com/android/internal/widget/ActionBarView.java
@@ -212,7 +212,7 @@
                     Log.e(TAG, "Activity component name not found!", e);
                 }
             }
-            if (mIcon == null) {
+            if (mIcon == null && !isInEditMode()) {
                 mIcon = appInfo.loadIcon(pm);
             }
         }