From 782e063d25b061ac7e16b0c0ed1e631943133b3a Mon Sep 17 00:00:00 2001 From: Sean McQuillan Date: Tue, 12 Jul 2022 14:03:10 -0700 Subject: [PATCH] Mark nullability for TextView.setText(char[]) Add @NonNull to TextView.setText(@NonNull char[], ...) This has always thrown a NPE since API 1. Bug: b/227218386 Test: atest android.widget.TextViewTest Relnote: "TextView.setText(@NonNull char[], ...) added nullability annotation." Change-Id: I212bb5b73d00185f83adb5e74d4acd07a1410ca8 --- core/api/current.txt | 2 +- core/java/android/widget/TextView.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index 0a61a9729309f..e5ab956dd3677 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -57701,7 +57701,7 @@ package android.widget { method public final void setSpannableFactory(android.text.Spannable.Factory); method public final void setText(CharSequence); method public void setText(CharSequence, android.widget.TextView.BufferType); - method public final void setText(char[], int, int); + method public final void setText(@NonNull char[], int, int); method public final void setText(@StringRes int); method public final void setText(@StringRes int, android.widget.TextView.BufferType); method public void setTextAppearance(@StyleRes int); diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index cd165ace789f0..b7bb09153fccf 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -6678,7 +6678,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * @param start start index in the char array * @param len length of char count after {@code start} */ - public final void setText(/* @NonNull */ char[] text, int start, int len) { + public final void setText(@NonNull char[] text, int start, int len) { int oldlen = 0; if (start < 0 || len < 0 || start + len > text.length) {