summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2012-01-17 13:54:57 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2012-01-17 13:54:57 -0800
commit20ee660cf7cc1038af40d5c6b43b3b6b426c3fc5 (patch)
tree0908a1176dc6efb774923ecfcce2731e212bd574
parentea768303402b523f5060458ccce9746856fdf83e (diff)
parentd3127d6fec57bba65cf7c8809d467d3a772080b2 (diff)
Merge "Emit the same detail message as dalvik for ArrayStoreException from code." into dalvik-dev
-rw-r--r--src/runtime_support.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/runtime_support.cc b/src/runtime_support.cc
index 696ef70b42..a6f6b0d0a6 100644
--- a/src/runtime_support.cc
+++ b/src/runtime_support.cc
@@ -778,7 +778,7 @@ extern "C" int artCanPutArrayElementFromCode(const Object* element, const Class*
} else {
FinishCalleeSaveFrameSetup(self, sp, Runtime::kRefsOnly);
Thread::Current()->ThrowNewExceptionF("Ljava/lang/ArrayStoreException;",
- "Cannot store an object of type %s in to an array of type %s",
+ "%s cannot be stored in an array of type %s",
PrettyDescriptor(element_class).c_str(),
PrettyDescriptor(array_class).c_str());
return -1; // Failure