commit 928bf02d2172afdc7162101aa9fa70b0d02243c3
author Brian Carlstrom <bdc@google.com> Tue Oct 11 02:48:14 2011 -0700
committer Brian Carlstrom <bdc@google.com> Tue Oct 11 02:48:14 2011 -0700
tree 1015194cd625ac231e356b15a7b302f08811c9b6
parent 582a7d16bb0db323d8bd730beb61578aa3765f43

Ensure getConstString uses slow path for non-image compilation

Change-Id: If7f0eeb277e1ddc9028c90d4b8fab1621f1ea77e

src/class_linker.cc

diff --git a/src/class_linker.cc b/src/class_linker.cc
index b495e3e..9a7cd16 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -2402,8 +2402,7 @@
   const DexFile::StringId& string_id = dex_file.GetStringId(string_idx);
   int32_t utf16_length = dex_file.GetStringLength(string_id);
   const char* utf8_data = dex_file.GetStringData(string_id);
-  // TODO: remote the const_cast below
-  String* string = const_cast<String*>(intern_table_->InternStrong(utf16_length, utf8_data));
+  String* string = intern_table_->InternStrong(utf16_length, utf8_data);
   dex_cache->SetResolvedString(string_idx, string);
   return string;
 }