commit b0a7f84b6de20edc6337163a4a07e3c524991ddb
author Jeff Brown <jeffbrown@android.com> Tue May 20 20:40:20 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 20 20:40:20 2014 +0000
tree 8f93e2071692f92c6d630d140a7dffadbb19ff14
parent 889814cee0ebcf70069d04d3ae77c97c09efb5a1
parent 63bf04d88bcc00876c30c9f2848da8c44b42185b

am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"

* commit '63bf04d88bcc00876c30c9f2848da8c44b42185b':
  Fix NullException in QwertyKeyListener.KeyDown

core/java/android/text/method/QwertyKeyListener.java

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 @@
             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;