Commit ebd909cc authored May 13, 2014 by Deepanshu Gupta Committed by Android Git Automerger May 13, 2014

am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in...

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

* commit 'ae5e0c7b':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

parents b161d6ba ae5e0c7b

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);
		}
		}