commit 620b1faf126d4b5f7cb5c353cebd374d1347fdd4
author satok <satok@google.com> Wed Nov 16 23:23:52 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 16 23:23:52 2011 -0800
tree ec5498766b06f85ea2885ea29dd31fea02c7bbd1
parent d845c26b0e72e67aa14b5eac4616eb5ee7d81b33
parent 554fdd21a1ec0058cdf5e697f2be6dd29d7eb31b

Merge "Fix the touch calibration bug" into ics-mr1

native/src/correction.cpp

diff --git a/native/src/correction.cpp b/native/src/correction.cpp
index 0c56680..27dc407 100644
--- a/native/src/correction.cpp
+++ b/native/src/correction.cpp
@@ -758,6 +758,9 @@
                 //         \             .
                 // C        \            .
                 //   0   R1 R2
+                if (factor <= 0) {
+                    return -1;
+                }
                 multiplyRate((int)(factor * 100), &finalFreq);
             } else if (squaredDistance == PROXIMITY_CHAR_WITHOUT_DISTANCE_INFO) {
                 multiplyRate(WORDS_WITH_PROXIMITY_CHARACTER_DEMOTION_RATE, &finalFreq);