summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author John Reck <jreck@google.com> 2019-07-12 13:53:04 -0700
committer John Reck <jreck@google.com> 2019-07-15 09:49:37 -0700
commit03bd07aa0d73d3c3d0431cf4ba8a19ca36b43da7 (patch)
tree75af55815f50f14ed5b5cb649fa2286f0914f17f
parentdcd4c584a14c78d5a9361bd265d2a6c67a7f49a2 (diff)
Fix exception message
buffer->flexFormat is only used if usingRGBAToJpegOverride is true, which appears to be the uncommon case. As such the unsupported format exception should be using the writerFormat instead, which is what's actually being looked up typically. Bug: 137323248 Test: snippet in bug & compare what format is actually switched on with what the exception message claims is unsupported. Change-Id: I54dda0088fd722126e80e38eebe5da2f26378e1d
-rw-r--r--media/jni/android_media_ImageWriter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_ImageWriter.cpp b/media/jni/android_media_ImageWriter.cpp
index 08d2947b795f..6d8b966f35d5 100644
--- a/media/jni/android_media_ImageWriter.cpp
+++ b/media/jni/android_media_ImageWriter.cpp
@@ -881,7 +881,7 @@ static bool Image_getLockedImageInfo(JNIEnv* env, LockedImage* buffer, int idx,
pixelStride, rowStride);
if (res != OK) {
jniThrowExceptionFmt(env, "java/lang/UnsupportedOperationException",
- "Pixel format: 0x%x is unsupported", buffer->flexFormat);
+ "Pixel format: 0x%x is unsupported", writerFormat);
return false;
}
return true;