From 5268248e0708951966e4f6514736a4030d5052da Mon Sep 17 00:00:00 2001 From: Deepanshu Gupta Date: Fri, 25 Apr 2014 20:47:16 -0700 Subject: [PATCH] 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 (cherry picked from commit 90ce58ecfdf7231611d70c849f14e5e71d1c8220) --- core/java/com/android/internal/widget/ActionBarView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java index 450f418700c6e..66fbfab60e838 100644 --- 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); } }