diff options
| author | Jeff Brown <jeffbrown@android.com> | 2014-05-20 20:44:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-20 20:44:21 +0000 |
| commit | 9777fdb7af696ca15906d03ad8aa7a3d8d51e4b3 (patch) | |
| tree | 62659bfd57748c6626cb32b406cebd8d1919ee4b /core/java/android/text | |
| parent | 7ba69dd8bd428494c7a2848b5d3325d47cf4afbf (diff) | |
| parent | b0a7f84b6de20edc6337163a4a07e3c524991ddb (diff) | |
| download | frameworks_base-9777fdb7af696ca15906d03ad8aa7a3d8d51e4b3.zip frameworks_base-9777fdb7af696ca15906d03ad8aa7a3d8d51e4b3.tar.gz frameworks_base-9777fdb7af696ca15906d03ad8aa7a3d8d51e4b3.tar.bz2 | |
am b0a7f84b: am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"
* commit 'b0a7f84b6de20edc6337163a4a07e3c524991ddb':
Fix NullException in QwertyKeyListener.KeyDown
Diffstat (limited to 'core/java/android/text')
| -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; |