From b0b89c87f60a8b6515d830ff5b36866fc64b7a26 Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Fri, 23 Mar 2012 22:34:49 +0900
Subject: Fix a native crash

-1 & 0xFFFF is 65536 :p

Change-Id: I8ecb882b6d6c5bcc91b52e23eb9cc02b04fcdd34
---
 .../inputmethod/latin/spellcheck/AndroidSpellCheckerService.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java')

diff --git a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
index 973a448ee..cd34ba832 100644
--- a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
+++ b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
@@ -574,7 +574,12 @@ public class AndroidSpellCheckerService extends SpellCheckerService
                     // The getXYForCodePointAndScript method returns (Y << 16) + X
                     final int xy = SpellCheckerProximityInfo.getXYForCodePointAndScript(
                             codePoint, mScript);
-                    composer.add(codePoint, xy & 0xFFFF, xy >> 16, null);
+                    if (SpellCheckerProximityInfo.NOT_A_COORDINATE_PAIR == xy) {
+                        composer.add(codePoint, WordComposer.NOT_A_COORDINATE,
+                                WordComposer.NOT_A_COORDINATE, null);
+                    } else {
+                        composer.add(codePoint, xy & 0xFFFF, xy >> 16, null);
+                    }
                 }
 
                 final int capitalizeType = getCapitalizationType(text);
-- 
cgit v1.2.3-83-g751a