diff options
Diffstat (limited to 'runtime/dex_file.cc')
| -rw-r--r-- | runtime/dex_file.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/runtime/dex_file.cc b/runtime/dex_file.cc index d3bb483b74..7e09a489be 100644 --- a/runtime/dex_file.cc +++ b/runtime/dex_file.cc @@ -457,9 +457,8 @@ const DexFile::StringId* DexFile::FindStringId(const char* string) const { int32_t hi = NumStringIds() - 1; while (hi >= lo) { int32_t mid = (hi + lo) / 2; - uint32_t length; const DexFile::StringId& str_id = GetStringId(mid); - const char* str = GetStringDataAndUtf16Length(str_id, &length); + const char* str = GetStringData(str_id); int compare = CompareModifiedUtf8ToModifiedUtf8AsUtf16CodePointValues(string, str); if (compare > 0) { lo = mid + 1; @@ -477,9 +476,8 @@ const DexFile::StringId* DexFile::FindStringId(const uint16_t* string) const { int32_t hi = NumStringIds() - 1; while (hi >= lo) { int32_t mid = (hi + lo) / 2; - uint32_t length; const DexFile::StringId& str_id = GetStringId(mid); - const char* str = GetStringDataAndUtf16Length(str_id, &length); + const char* str = GetStringData(str_id); int compare = CompareModifiedUtf8ToUtf16AsCodePointValues(str, string); if (compare > 0) { lo = mid + 1; |