diff options
| author | Ted Choc <tedchoc@google.com> | 2015-08-27 14:18:47 -0700 |
|---|---|---|
| committer | Ted Choc <tedchoc@google.com> | 2015-08-27 21:20:08 +0000 |
| commit | eaf32abafb953824559d2a2362d8abfafddc281b (patch) | |
| tree | 27debaab81c9fb63ce13b1ab082923212ba6cb69 | |
| parent | f61571c931db7a111b205cbba7ac9b30be4ffd3d (diff) | |
| download | chromium_src-eaf32abafb953824559d2a2362d8abfafddc281b.zip chromium_src-eaf32abafb953824559d2a2362d8abfafddc281b.tar.gz chromium_src-eaf32abafb953824559d2a2362d8abfafddc281b.tar.bz2 | |
Fix crash in url fading accessibility string.
TextUtils.concat tries to copy over spannable strings and that
is not needed here. Switch to using a pure string concat.
BUG=524679
Review URL: https://codereview.chromium.org/1314893005
Cr-Commit-Position: refs/heads/master@{#345511}
Review URL: https://codereview.chromium.org/1314763010 .
Cr-Commit-Position: refs/branch-heads/2490@{#56}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
| -rw-r--r-- | chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlContainer.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlContainer.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlContainer.java index 284bd8e..258cccf 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlContainer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlContainer.java @@ -211,8 +211,7 @@ public class UrlContainer extends ViewGroup { if (!TextUtils.isEmpty(mTrailingTextView.getText())) { mUrlBarView.setAccessibilityTextOverride( - TextUtils.concat(mUrlBarView.getText(), mTrailingTextView.getText()) - .toString()); + mUrlBarView.getText().toString() + mTrailingTextView.getText().toString()); } AnimatorSet set = new AnimatorSet(); |