diff options
| author | 2024-12-02 15:02:51 +0000 | |
|---|---|---|
| committer | 2024-12-02 15:02:51 +0000 | |
| commit | 187316590e9a34c50723f149d63912f4455fcb36 (patch) | |
| tree | 8f1985e24854dee975e59d7c8ddbde38ee0fe78e | |
| parent | 06d34f9533334dac726e23b6aeaddaf859dfd8c2 (diff) | |
| parent | 4e56223e8643b7686b12e4e6dc933d122ed29920 (diff) | |
Prettify field type descriptor in `DexFile::PrettyField()`. am: 4e56223e86
Original change: https://android-review.googlesource.com/c/platform/art/+/3386359
Change-Id: Ifb685f95f5b5380b6760cc1e54c4c922542955c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libdexfile/dex/dex_file.cc | 2 | ||||
| -rw-r--r-- | libdexfile/dex/test_dex_file_builder_test.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libdexfile/dex/dex_file.cc b/libdexfile/dex/dex_file.cc index 2b68cfad0d..f30d39f30a 100644 --- a/libdexfile/dex/dex_file.cc +++ b/libdexfile/dex/dex_file.cc @@ -692,7 +692,7 @@ std::string DexFile::PrettyField(uint32_t field_idx, bool with_type) const { const FieldId& field_id = GetFieldId(field_idx); std::string result; if (with_type) { - result += GetFieldTypeDescriptor(field_id); + AppendPrettyDescriptor(GetFieldTypeDescriptor(field_id), &result); result += ' '; } AppendPrettyDescriptor(GetFieldDeclaringClassDescriptor(field_id), &result); diff --git a/libdexfile/dex/test_dex_file_builder_test.cc b/libdexfile/dex/test_dex_file_builder_test.cc index 9aeaded1ab..82f1b5d46b 100644 --- a/libdexfile/dex/test_dex_file_builder_test.cc +++ b/libdexfile/dex/test_dex_file_builder_test.cc @@ -67,7 +67,7 @@ TEST(TestDexFileBuilderTest, SimpleTest) { } ASSERT_EQ(1u, dex_file->NumFieldIds()); - EXPECT_STREQ("[I TestClass.intField", dex_file->PrettyField(0u).c_str()); + EXPECT_STREQ("int[] TestClass.intField", dex_file->PrettyField(0u).c_str()); ASSERT_EQ(2u, dex_file->NumProtoIds()); ASSERT_EQ(2u, dex_file->NumMethodIds()); |