Merge "Change a few places to use string version of GetTypeId"

am: 8cb0bc28b1

* commit '8cb0bc28b1161dad0d2c2c1e75318b7e504faa46':
  Change a few places to use string version of GetTypeId

1 files changed, 1 insertions, 5 deletions

diff --git a/runtime/dex_file.cc b/runtime/dex_file.cc
index b3ca6ac131..3a93aace83 100644
--- a/runtime/dex_file.cc
+++ b/runtime/dex_file.cc
@@ -738,11 +738,7 @@ bool DexFile::CreateTypeList(const StringPiece& signature, uint16_t* return_type
     }
     // TODO: avoid creating a std::string just to get a 0-terminated char array
     std::string descriptor(signature.data() + start_offset, offset - start_offset);
-    const DexFile::StringId* string_id = FindStringId(descriptor.c_str());
-    if (string_id == nullptr) {
-      return false;
-    }
-    const DexFile::TypeId* type_id = FindTypeId(GetIndexForStringId(*string_id));
+    const DexFile::TypeId* type_id = FindTypeId(descriptor.c_str());
     if (type_id == nullptr) {
       return false;
     }