diff options
| author | 2016-10-03 18:01:28 -0700 | |
|---|---|---|
| committer | 2016-10-04 10:46:16 -0700 | |
| commit | 1cc62e4ea24828fdb3f3da0b8603f0b107d09a04 (patch) | |
| tree | 718e322f3d05ac095770d4dc2a68b824bf3974a7 /runtime/native/dalvik_system_DexFile.cc | |
| parent | 82d4838d6bb3480cd25327cedc5179fb2d86881c (diff) | |
Rename ObjPtr::Decode to ObjPtr::Ptr
Done to prevent ambiguity with ScopedObjectAccess::Decode.
Bug: 31113334
Test: test-art-host
Change-Id: I07a2497cc9cf66386311798933547471987fc316
Diffstat (limited to 'runtime/native/dalvik_system_DexFile.cc')
| -rw-r--r-- | runtime/native/dalvik_system_DexFile.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc index 0677d5bf04..086da60728 100644 --- a/runtime/native/dalvik_system_DexFile.cc +++ b/runtime/native/dalvik_system_DexFile.cc @@ -287,7 +287,7 @@ static jclass DexFile_defineClassNative(JNIEnv* env, *dex_class_def); // Add the used dex file. This only required for the DexFile.loadClass API since normal // class loaders already keep their dex files live. - class_linker->InsertDexFileInToClassLoader(soa.Decode<mirror::Object>(dexFile).Decode(), + class_linker->InsertDexFileInToClassLoader(soa.Decode<mirror::Object>(dexFile).Ptr(), class_loader.Get()); if (result != nullptr) { VLOG(class_linker) << "DexFile_defineClassNative returning " << result |