diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index 3af8636895548..18e211869c9cd 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -2233,7 +2233,7 @@ public class AccessibilityNodeInfo implements Parcelable { */ public void setText(CharSequence text) { enforceNotSealed(); - mText = text; + mText = (text == null) ? null : text.subSequence(0, text.length()); } /** @@ -2250,7 +2250,7 @@ public class AccessibilityNodeInfo implements Parcelable { */ public void setError(CharSequence error) { enforceNotSealed(); - mError = error; + mError = (error == null) ? null : error.subSequence(0, error.length()); } /** @@ -2285,7 +2285,8 @@ public class AccessibilityNodeInfo implements Parcelable { */ public void setContentDescription(CharSequence contentDescription) { enforceNotSealed(); - mContentDescription = contentDescription; + mContentDescription = (contentDescription == null) ? null + : contentDescription.subSequence(0, contentDescription.length()); } /** diff --git a/core/java/android/view/accessibility/AccessibilityRecord.java b/core/java/android/view/accessibility/AccessibilityRecord.java index f99690adcffaa..f2979bb82dcd2 100644 --- a/core/java/android/view/accessibility/AccessibilityRecord.java +++ b/core/java/android/view/accessibility/AccessibilityRecord.java @@ -572,7 +572,8 @@ public class AccessibilityRecord { */ public void setBeforeText(CharSequence beforeText) { enforceNotSealed(); - mBeforeText = beforeText; + mBeforeText = (beforeText == null) ? null + : beforeText.subSequence(0, beforeText.length()); } /** @@ -593,7 +594,8 @@ public class AccessibilityRecord { */ public void setContentDescription(CharSequence contentDescription) { enforceNotSealed(); - mContentDescription = contentDescription; + mContentDescription = (contentDescription == null) ? null + : contentDescription.subSequence(0, contentDescription.length()); } /**