commit 47ab650bca91200b0b373521691f33b5ce493d6e
author Raph Levien <raph@google.com> Tue Jun 19 08:43:56 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 19 08:43:56 2012 -0700
tree efbf4fd516decc591e86138b25c7224d41c93820
parent b3057959676d388d588db1af57b35bb4da16b089
parent e25071650ee4761c86a1b8323de26a07a0f6ad79

Merge "Fix bug 6688060: breakage in AndroidCharacter.mirror"

core/jni/android_text_AndroidCharacter.cpp

diff --git a/core/jni/android_text_AndroidCharacter.cpp b/core/jni/android_text_AndroidCharacter.cpp
index dacbe41..8b85a7b7 100644
--- a/core/jni/android_text_AndroidCharacter.cpp
+++ b/core/jni/android_text_AndroidCharacter.cpp
@@ -157,6 +157,7 @@
         return false;
     }
 
+    bool ret = false;
     for (int i = start; i < start + count; i++) {
         // XXX this thinks it knows that surrogates are never mirrored
 
@@ -165,10 +166,10 @@
 
         if (c1 != c2) {
             data[i] = c2;
-            return true;
+            ret = true;
         }
     }
-    return false;
+    return ret;
 }
 
 static jchar getMirror(JNIEnv* env, jobject obj, jchar c)