commit 4f4b83c50c67d4520af3d5b4733b1627208275ce
author Fabrice Di Meglio <fdimeglio@google.com> Wed Nov 02 17:50:18 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 02 17:50:18 2011 +0000
tree e913ceecc5712941cae254daad45d59a99465e15
parent cf3b31704ae7743ca85219bca9698adcf6fbc67a
parent 07b4b3145333bc8ece9fdbb68ade726b3d6485cd

am 07b4b314: am bcf05a69: Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"

* commit '07b4b3145333bc8ece9fdbb68ade726b3d6485cd':
  Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"

core/jni/android/graphics/TextLayoutCache.cpp

diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp
index 89c8d31..10293e2 100644
--- a/core/jni/android/graphics/TextLayoutCache.cpp
+++ b/core/jni/android/graphics/TextLayoutCache.cpp
@@ -557,7 +557,11 @@
                     LOGD("computeValuesWithHarfbuzz -- dirFlags=%d run-count=%d paraDir=%d",
                             dirFlags, rc, paraDir);
 #endif
-                    if (!U_SUCCESS(status) || rc <= 1) {
+                    if (U_SUCCESS(status) && rc == 1) {
+                        // Normal case: one run, status is ok
+                        isRTL = (paraDir == 1);
+                        useSingleRun = true;
+                    } else if (!U_SUCCESS(status) || rc < 1) {
                         LOGW("computeValuesWithHarfbuzz -- need to force to single run");
                         isRTL = (paraDir == 1);
                         useSingleRun = true;