Merge "Remove unused DexFile UTF-16-based string lookup"
diff --git a/libdexfile/dex/dex_file.cc b/libdexfile/dex/dex_file.cc
index 1f47110..8cfee66 100644
--- a/libdexfile/dex/dex_file.cc
+++ b/libdexfile/dex/dex_file.cc
@@ -349,25 +349,6 @@
return nullptr;
}
-const DexFile::StringId* DexFile::FindStringId(const uint16_t* string, size_t length) const {
- int32_t lo = 0;
- int32_t hi = NumStringIds() - 1;
- while (hi >= lo) {
- int32_t mid = (hi + lo) / 2;
- const DexFile::StringId& str_id = GetStringId(dex::StringIndex(mid));
- const char* str = GetStringData(str_id);
- int compare = CompareModifiedUtf8ToUtf16AsCodePointValues(str, string, length);
- if (compare > 0) {
- lo = mid + 1;
- } else if (compare < 0) {
- hi = mid - 1;
- } else {
- return &str_id;
- }
- }
- return nullptr;
-}
-
const DexFile::TypeId* DexFile::FindTypeId(dex::StringIndex string_idx) const {
int32_t lo = 0;
int32_t hi = NumTypeIds() - 1;
diff --git a/libdexfile/dex/dex_file.h b/libdexfile/dex/dex_file.h
index 683a824..4098b42 100644
--- a/libdexfile/dex/dex_file.h
+++ b/libdexfile/dex/dex_file.h
@@ -504,9 +504,6 @@
const TypeId* FindTypeId(const char* string) const;
- // Looks up a string id for a given utf16 string.
- const StringId* FindStringId(const uint16_t* string, size_t length) const;
-
// Returns the number of type identifiers in the .dex file.
uint32_t NumTypeIds() const {
DCHECK(header_ != nullptr) << GetLocation();