| commit | 4c0c4f2b23156fc05d99d565d45508c493691b3a | [log] [tgz] |
|---|---|---|
| author | Nader Jawad <[email protected]> | Sat Sep 16 22:15:46 2023 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Sat Sep 16 22:15:46 2023 +0000 |
| tree | a10dd8e2b99572cd4e084c349c089ff94b83a0d1 | |
| parent | cfccabd9e9b12db285d01c49313be63982bb3d2a [diff] | |
| parent | 90454ddae0b737721426b33abaaaa355d22b921a [diff] |
Merge "Fix NullPointerException in TextView#canPasteAsPlainText" into main am: bcb11acc9a am: 90454ddae0 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2738674 Change-Id: I05d13a5a52970261a7a97bdba4456821ef63889c Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index db7d484..b5f05e4 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java
@@ -14996,6 +14996,9 @@ 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);