diff options
| author | Jeff Brown <jeffbrown@android.com> | 2014-05-20 20:40:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-20 20:40:20 +0000 |
| commit | b0a7f84b6de20edc6337163a4a07e3c524991ddb (patch) | |
| tree | 8f93e2071692f92c6d630d140a7dffadbb19ff14 | |
| parent | 889814cee0ebcf70069d04d3ae77c97c09efb5a1 (diff) | |
| parent | 63bf04d88bcc00876c30c9f2848da8c44b42185b (diff) | |
| download | frameworks_base-b0a7f84b6de20edc6337163a4a07e3c524991ddb.zip frameworks_base-b0a7f84b6de20edc6337163a4a07e3c524991ddb.tar.gz frameworks_base-b0a7f84b6de20edc6337163a4a07e3c524991ddb.tar.bz2 | |
am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"
* commit '63bf04d88bcc00876c30c9f2848da8c44b42185b':
Fix NullException in QwertyKeyListener.KeyDown
| -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; |