diff options
| author | Adam Powell <adamp@google.com> | 2013-04-18 13:53:27 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2013-04-18 13:56:22 -0700 |
| commit | 2eeb419e55e0467e04ca054a2de04b725604da27 (patch) | |
| tree | 97a17ff019d1d52cc96a308cef8011c42a992069 /core/java/com/android | |
| parent | d3f9ffe28d1599e40f8c9a7c0c32465324bb2828 (diff) | |
| download | frameworks_base-2eeb419e55e0467e04ca054a2de04b725604da27.zip frameworks_base-2eeb419e55e0467e04ca054a2de04b725604da27.tar.gz frameworks_base-2eeb419e55e0467e04ca054a2de04b725604da27.tar.bz2 | |
Fix ActionBar#setHomeActionContentDescription(0)
This call should be analogous to calling
setHomeActionContentDescription(null) and not throw an exception.
Bug 8657256
Change-Id: Ifa9c7b999f4bf1a31fba43f869e234b1f1861512
Diffstat (limited to 'core/java/com/android')
| -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 59ff597..d69bc31 100644 --- a/core/java/com/android/internal/widget/ActionBarView.java +++ b/core/java/com/android/internal/widget/ActionBarView.java @@ -1354,7 +1354,7 @@ public class ActionBarView extends AbsActionBarView { public void setHomeActionContentDescription(int resId) { mHomeDescriptionRes = resId; - mHomeDescription = getResources().getText(resId); + mHomeDescription = resId != 0 ? getResources().getText(resId) : null; } static class SavedState extends BaseSavedState { |