diff options
| author | Jeff Brown <jeffbrown@android.com> | 2014-05-20 20:37:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-20 20:37:44 +0000 |
| commit | 63bf04d88bcc00876c30c9f2848da8c44b42185b (patch) | |
| tree | 5712d45581df52386cfafbe15d02bf800890a96f /core | |
| parent | 32912e0a7308d2e0327b3273763f0b13fd0099c0 (diff) | |
| parent | e004b868f3e10d133798cfc719a69e3a1db0fa18 (diff) | |
| download | frameworks_base-63bf04d88bcc00876c30c9f2848da8c44b42185b.zip frameworks_base-63bf04d88bcc00876c30c9f2848da8c44b42185b.tar.gz frameworks_base-63bf04d88bcc00876c30c9f2848da8c44b42185b.tar.bz2 | |
Merge "Fix NullException in QwertyKeyListener.KeyDown"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/text/method/QwertyKeyListener.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/text/method/QwertyKeyListener.java b/core/java/android/text/method/QwertyKeyListener.java index 0bd46bc..b17f502 100644 --- a/core/java/android/text/method/QwertyKeyListener.java +++ b/core/java/android/text/method/QwertyKeyListener.java @@ -115,7 +115,7 @@ public class QwertyKeyListener extends BaseKeyListener { if (count > 0 && selStart == selEnd && selStart > 0) { char c = content.charAt(selStart - 1); - if (c == i || c == Character.toUpperCase(i) && view != null) { + if ((c == i || c == Character.toUpperCase(i)) && view != null) { if (showCharacterPicker(view, content, c, false, count)) { resetMetaState(content); return true; |