Commit 5268248e authored Apr 25, 2014 by Deepanshu Gupta

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 90ce58ec)

parent 85f53c33

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}