diff --git a/core/java/android/widget/Toolbar.java b/core/java/android/widget/Toolbar.java index 8c67bb770b5af..5033bee91b366 100644 --- a/core/java/android/widget/Toolbar.java +++ b/core/java/android/widget/Toolbar.java @@ -592,7 +592,7 @@ public class Toolbar extends ViewGroup { */ public void setNavigationContentDescription(int resId) { ensureNavButtonView(); - mNavButtonView.setContentDescription(getContext().getText(resId)); + mNavButtonView.setContentDescription(resId != 0 ? getContext().getText(resId) : null); } /**