summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nader Jawad <njawad@google.com> 2023-09-16 23:12:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-16 23:12:00 +0000
commit97a60a7511d63caeea8024de11765dcb16668a53 (patch)
tree457287fa3ba7466f6c3391474ed6005fb40e9904
parentbf6068558cea67da60243cb217ec791f7cec5923 (diff)
parent4c0c4f2b23156fc05d99d565d45508c493691b3a (diff)
Merge "Fix NullPointerException in TextView#canPasteAsPlainText" into main am: bcb11acc9a am: 90454ddae0 am: 4c0c4f2b23
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2738674 Change-Id: Iac74a252abc9f164048e50f688d817e9e46a2e92 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/widget/TextView.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index db7d48471d9d..b5f05e49d6c3 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -14996,6 +14996,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
final ClipDescription description =
getClipboardManagerForUser().getPrimaryClipDescription();
+ if (description == null) {
+ return false;
+ }
final boolean isPlainType = description.hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN);
return (isPlainType && description.isStyledText())
|| description.hasMimeType(ClipDescription.MIMETYPE_TEXT_HTML);