summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-01-17 13:23:33 +0000
committerSteve Kondik <shade@chemlab.org>2014-02-02 02:05:02 -0800
commit653ffbf481aa19c4f6c9a358b33d0d812758dfe5 (patch)
tree656c983e046a7118c4d17117d79ee116513a4bb6
parent9c57d27d7943525f288de1122b506aea4c769dcc (diff)
downloadandroid_dalvik-653ffbf481aa19c4f6c9a358b33d0d812758dfe5.tar.gz
android_dalvik-653ffbf481aa19c4f6c9a358b33d0d812758dfe5.tar.bz2
android_dalvik-653ffbf481aa19c4f6c9a358b33d0d812758dfe5.zip
Change exception message for ArrayStoreException.
The exception message is tested in SystemTest. I'm not sure what's worse: Changing the dalvik message or changing the test to be happy with both messages. (I assume the art message is the one we chose because it's more recent.) Change-Id: Ia68641a05f992ab5a949add865fb3f7bb46e61be
-rw-r--r--vm/Exception.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/Exception.cpp b/vm/Exception.cpp
index ca7614096..36f2d20c0 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,
- "%s and %s are incompatible array types",
+ "Incompatible types: src=%s, dst=%s",
source, destination);
}