aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2014-04-29 11:45:21 +0100
committerLorDClockaN <davor@losinj.com>2014-04-29 18:07:21 +0200
commit9515dedb242f6bf1848d4b9c493b2455f5005dea (patch)
treefc47da6668644a092c6082546a2729d5e2be8f9b
parent4c2c3a87856c316f14b2e8f30200adc7dc4e7801 (diff)
Revert "Change exception message for ArrayStoreException."
Fix all the libcore.java.lang.ArrayStoreExceptionTest failures. Why are we pulling cosmetic changes from master? This reverts commit 653ffbf481aa19c4f6c9a358b33d0d812758dfe5. Change-Id: Icc4d1b40c578a5eef6890e9a03c7b10a96b75c0b
-rw-r--r--vm/Exception.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/Exception.cpp b/vm/Exception.cpp
index 36f2d20c0..ca7614096 100644
--- a/vm/Exception.cpp
+++ b/vm/Exception.cpp
@@ -1225,7 +1225,7 @@ void dvmThrowArrayStoreExceptionNotArray(ClassObject* actual, const char* label)
void dvmThrowArrayStoreExceptionIncompatibleArrays(ClassObject* source, ClassObject* destination)
{
throwTypeError(gDvm.exArrayStoreException,
- "Incompatible types: src=%s, dst=%s",
+ "%s and %s are incompatible array types",
source, destination);
}