diff options
| author | Ian Rogers <irogers@google.com> | 2013-10-30 17:17:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-30 17:17:11 +0000 |
| commit | 7195dd860e424057bd9a17d501269d9b50673f11 (patch) | |
| tree | 3e656d8b35f6f74b2e4fbc398c1834a96bb6b73d /runtime/native/dalvik_system_VMRuntime.cc | |
| parent | 9728f91a63016136261231ff5213bde703bd27b6 (diff) | |
| parent | dfb325e0ddd746cd8f7c2e3723b3a573eb7cc111 (diff) | |
| download | art-7195dd860e424057bd9a17d501269d9b50673f11.zip art-7195dd860e424057bd9a17d501269d9b50673f11.tar.gz art-7195dd860e424057bd9a17d501269d9b50673f11.tar.bz2 | |
Merge "Don't use UTF16 length as length for MUTF8." into dalvik-dev
Diffstat (limited to 'runtime/native/dalvik_system_VMRuntime.cc')
| -rw-r--r-- | runtime/native/dalvik_system_VMRuntime.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc index 4629dbd..71ed95c 100644 --- a/runtime/native/dalvik_system_VMRuntime.cc +++ b/runtime/native/dalvik_system_VMRuntime.cc @@ -222,7 +222,7 @@ static void PreloadDexCachesResolveString(mirror::DexCache* dex_cache, } const DexFile* dex_file = dex_cache->GetDexFile(); uint32_t utf16Size; - const char* utf8 = dex_file->StringDataAndLengthByIdx(string_idx, &utf16Size); + const char* utf8 = dex_file->StringDataAndUtf16LengthByIdx(string_idx, &utf16Size); string = strings[utf8]; if (string == NULL) { return; |