Snap for 5909972 from 88cff2875427eebd50e389ecc51404af35955447 to qt-qpr1-release
Change-Id: I5acbc29b097ae08adea7983d76e29db69ed3f2b3
diff --git a/tests/src/com/android/tradefed/device/TestDeviceTest.java b/tests/src/com/android/tradefed/device/TestDeviceTest.java
index 41b76cd..59dedfc 100644
--- a/tests/src/com/android/tradefed/device/TestDeviceTest.java
+++ b/tests/src/com/android/tradefed/device/TestDeviceTest.java
@@ -3873,11 +3873,11 @@
Assert.assertEquals(3000, testImage.data.length);
byte[] result = mTestDevice.compressRawImage(testImage, "PNG", true);
// Size after compressing can vary a bit depending of the JDK
- if (result.length != 107 && result.length != 117) {
+ if (result.length != 107 && result.length != 117 && result.length != 139) {
fail(
String.format(
"Should have compress the length as expected, got %s, "
- + "expected 107 or 117",
+ + "expected 107 or 117 or 139",
result.length));
}