diff options
author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-04-29 11:45:21 +0100 |
---|---|---|
committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-04-29 11:46:59 +0100 |
commit | 05184b0017e80edd52fbe80c920b366e071efae1 (patch) | |
tree | 04a122c3f65d648b26eeb688baf19d39d63d42a3 | |
parent | dfe86e0dd03af2e9333a680ad4c65276a0b5da45 (diff) | |
download | android_dalvik-05184b0017e80edd52fbe80c920b366e071efae1.tar.gz android_dalvik-05184b0017e80edd52fbe80c920b366e071efae1.tar.bz2 android_dalvik-05184b0017e80edd52fbe80c920b366e071efae1.zip |
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.cpp | 2 |
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); } |