diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-04-25 20:47:16 -0700 |
|---|---|---|
| committer | Deepanshu Gupta <deepanshu@google.com> | 2014-05-07 18:09:47 -0700 |
| commit | 5268248e0708951966e4f6514736a4030d5052da (patch) | |
| tree | 5a9d538cb0f64cc1fa8826bf281ef519a66d0c4d /core/java | |
| parent | 85f53c3335daf0e55cec757fd66fe560e0b020ef (diff) | |
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)
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java index 450f418700c6..66fbfab60e83 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); } } |