diff options
| author | Abodunrinwa Toki <toki@google.com> | 2019-01-07 17:10:30 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-07 17:10:30 -0800 |
| commit | adcd10f10f113fda44b05db418223d26b1dc193c (patch) | |
| tree | c04c87b8ce40b84a1cfa7430dedbc3f4b8b5ffe9 /core/java/android/widget | |
| parent | 7ae1e84f61f18d88c7db878c75f04fab0bd81ae9 (diff) | |
| parent | a69950ce18f85ea8514083a5e175450e17e93565 (diff) | |
RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.
am: a69950ce18
Change-Id: I0830e1c1a1cea2fd93f0b1ed8a1a792260201bb2
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/SelectionActionModeHelper.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/widget/SelectionActionModeHelper.java b/core/java/android/widget/SelectionActionModeHelper.java index 6cb0eaa7f47d..0d88e6986f11 100644 --- a/core/java/android/widget/SelectionActionModeHelper.java +++ b/core/java/android/widget/SelectionActionModeHelper.java @@ -31,6 +31,7 @@ import android.text.Layout; import android.text.Selection; import android.text.Spannable; import android.text.TextUtils; +import android.text.util.Linkify; import android.util.Log; import android.view.ActionMode; import android.view.textclassifier.SelectionEvent; @@ -1045,7 +1046,12 @@ public final class SelectionActionModeHelper { trimText(); final TextClassification classification; - if (mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.P) { + if (Linkify.containsUnsupportedCharacters(mText)) { + // Do not show smart actions for text containing unsupported characters. + android.util.EventLog.writeEvent(0x534e4554, "116321860", -1, ""); + classification = TextClassification.EMPTY; + } else if (mContext.getApplicationInfo().targetSdkVersion + >= Build.VERSION_CODES.P) { final TextClassification.Request request = new TextClassification.Request.Builder( mTrimmedText, mRelativeStart, mRelativeEnd) |