From 0374b62bbeffa880714a5815576ddd2fc416e58d Mon Sep 17 00:00:00 2001 From: Mihai Popa Date: Mon, 14 Jan 2019 11:45:36 +0000 Subject: [PATCH] Fix TextView#setTextCursorDrawable for resid=0 The CL fixes TextView#setTextCursorDrawable, for the case when a zero drawable resource id is passed. We want to set a null Drawable, but the Context#getDrawable(0) call was throwing rather than returning null. Bug: 122742983 Test: atest CtsWidgetTestCases:android.widget.cts.TextViewTest Change-Id: I45bf57002043d7dbe541d76e61fce3f729959fc8 --- core/java/android/widget/TextView.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 51b8734fdcc19..0d16998d17eed 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -3685,7 +3685,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * @attr ref android.R.styleable#TextView_textCursorDrawable */ public void setTextCursorDrawable(@DrawableRes int textCursorDrawable) { - setTextCursorDrawable(mContext.getDrawable(textCursorDrawable)); + setTextCursorDrawable( + textCursorDrawable != 0 ? mContext.getDrawable(textCursorDrawable) : null); } /**