summaryrefslogtreecommitdiffstats
path: root/runtime/native
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-05-28 11:09:10 -0700
committerBrian Carlstrom <bdc@google.com>2014-05-28 13:05:55 -0700
commitcf790bb92d8e0dcc7b38da6873d982b9e9881682 (patch)
tree42192286d73aa4ae815279b97977ce63e0ad1485 /runtime/native
parent6d25996baef5037d0aa8beb2f517755f2fb7b91f (diff)
downloadart-cf790bb92d8e0dcc7b38da6873d982b9e9881682.zip
art-cf790bb92d8e0dcc7b38da6873d982b9e9881682.tar.gz
art-cf790bb92d8e0dcc7b38da6873d982b9e9881682.tar.bz2
Fix DexFile.entries to return class names, not class descriptors
Bug: 15141726 (cherry picked from commit f2f9daf9ba33b15abddfc8f8d03a708a7908b765) Change-Id: I28ce8aae1713a9826a3373e1eb60e0edf267f64c
Diffstat (limited to 'runtime/native')
-rw-r--r--runtime/native/dalvik_system_DexFile.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc
index 8f74dd7..a0a294a 100644
--- a/runtime/native/dalvik_system_DexFile.cc
+++ b/runtime/native/dalvik_system_DexFile.cc
@@ -206,8 +206,8 @@ static jobjectArray DexFile_getClassNameList(JNIEnv* env, jclass, jlong cookie)
if (result != nullptr) {
for (size_t i = 0; i < dex_file->NumClassDefs(); ++i) {
const DexFile::ClassDef& class_def = dex_file->GetClassDef(i);
- const char* descriptor = dex_file->GetClassDescriptor(class_def);
- ScopedLocalRef<jstring> jdescriptor(env, env->NewStringUTF(descriptor));
+ std::string descriptor(DescriptorToDot(dex_file->GetClassDescriptor(class_def)));
+ ScopedLocalRef<jstring> jdescriptor(env, env->NewStringUTF(descriptor.c_str()));
if (jdescriptor.get() == nullptr) {
return nullptr;
}