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

* commit 'b0a7f84b6de20edc6337163a4a07e3c524991ddb':
  Fix NullException in QwertyKeyListener.KeyDown
This commit is contained in:
Jeff Brown
2014-05-20 20:44:21 +00:00
committed by Android Git Automerger

View File

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