1 files changed, 9 insertions, 15 deletions

diff --git a/runtime/sdk_checker.cc b/runtime/sdk_checker.cc
index 1dbe39c32e..95023829a5 100644
--- a/runtime/sdk_checker.cc
+++ b/runtime/sdk_checker.cc
@@ -25,21 +25,17 @@ namespace art {
 
 SdkChecker::SdkChecker() : enabled_(true) {}
 
-SdkChecker* SdkChecker::Create(
-    const std::string& public_sdk, std::string* error_msg) {
+SdkChecker* SdkChecker::Create(const std::string& public_sdk, std::string* error_msg) {
   std::vector<std::string> dex_file_paths;
   Split(public_sdk, ':', &dex_file_paths);
 
-  ArtDexFileLoader dex_loader;
-
   std::unique_ptr<SdkChecker> sdk_checker(new SdkChecker());
   for (const std::string& path : dex_file_paths) {
-    if (!dex_loader.Open(path.c_str(),
-                         path,
-                         /*verify=*/ true,
-                         /*verify_checksum*/ false,
-                         error_msg,
-                         &sdk_checker->sdk_dex_files_)) {
+    DexFileLoader dex_file_loader(path);
+    if (!dex_file_loader.Open(/*verify=*/true,
+                              /*verify_checksum*/ false,
+                              error_msg,
+                              &sdk_checker->sdk_dex_files_)) {
       return nullptr;
     }
   }
@@ -66,9 +62,7 @@ bool SdkChecker::ShouldDenyAccess(ArtMethod* art_method) const {
     dex::TypeIndex return_type_idx;
     std::vector<dex::TypeIndex> param_type_idxs;
     if (!dex_file->CreateTypeList(
-            art_method->GetSignature().ToString().c_str(),
-            &return_type_idx,
-            &param_type_idxs)) {
+            art_method->GetSignature().ToString(), &return_type_idx, &param_type_idxs)) {
       continue;
     }
     const dex::ProtoId* proto_id = dex_file->FindProtoId(return_type_idx, param_type_idxs);
@@ -101,8 +95,8 @@ bool SdkChecker::ShouldDenyAccess(ArtField* art_field) const {
   for (const std::unique_ptr<const DexFile>& dex_file : sdk_dex_files_) {
     std::string declaring_class;
 
-    const dex::TypeId* declaring_type_id = dex_file->FindTypeId(
-        art_field->GetDeclaringClass()->GetDescriptor(&declaring_class));
+    const dex::TypeId* declaring_type_id =
+        dex_file->FindTypeId(art_field->GetDeclaringClass()->GetDescriptor(&declaring_class));
     if (declaring_type_id == nullptr) {
       continue;
     }