summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-07-08 21:07:09 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-07-08 21:07:09 -0700
commitfe811d8bd0da15f14702968a9c7deb02db7eec9f (patch)
tree14d0adb3ca2734e1d0da6dec059c604cf10aea91 /libs
parent8a715b4b791db4390d12e0ded02280592634a424 (diff)
parent361d477957feb07454b93509da0bfd05e9c718a8 (diff)
downloadframeworks_base-fe811d8bd0da15f14702968a9c7deb02db7eec9f.zip
frameworks_base-fe811d8bd0da15f14702968a9c7deb02db7eec9f.tar.gz
frameworks_base-fe811d8bd0da15f14702968a9c7deb02db7eec9f.tar.bz2
Merge change 6603 into donut
* changes: quick fix; utf8_codepoint_count must be utf8_length
Diffstat (limited to 'libs')
-rw-r--r--libs/utils/String8.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/utils/String8.cpp b/libs/utils/String8.cpp
index 71bf3ce..e908ec1 100644
--- a/libs/utils/String8.cpp
+++ b/libs/utils/String8.cpp
@@ -681,7 +681,7 @@ size_t strnlen32(const char32_t *s, size_t maxlen)
return ss-s;
}
-size_t utf8_codepoint_count(const char *src)
+size_t utf8_length(const char *src)
{
const char *cur = src;
size_t ret = 0;