Cherry-pick old fix for jdk differences

Test: unit tests
Bug: 140634978
Change-Id: I68323e16541b8273ff69144e5041f813fbee2170
Merged-In: I6a46050c049416bc1b62f873a1d5226cf81f0a6a

1 files changed, 8 insertions, 2 deletions

diff --git a/tests/src/com/android/tradefed/device/TestDeviceTest.java b/tests/src/com/android/tradefed/device/TestDeviceTest.java
index 31d17f727..26f3d2985 100644
--- a/tests/src/com/android/tradefed/device/TestDeviceTest.java
+++ b/tests/src/com/android/tradefed/device/TestDeviceTest.java
@@ -3033,8 +3033,14 @@ public class TestDeviceTest extends TestCase {
             // Size of the raw test data
             Assert.assertEquals(3000, testImage.data.length);
             byte[] result = mTestDevice.compressRawImage(testImage, "PNG", true);
-            // Size after compressing
-            Assert.assertEquals(107, result.length);
+            // Size after compressing can vary a bit depending of the JDK
+            if (result.length != 107 && result.length != 117) {
+                fail(
+                        String.format(
+                                "Should have compress the length as expected, got %s, "
+                                        + "expected 107 or 117",
+                                result.length));
+            }
 
             // Do it again with JPEG encoding
             Assert.assertEquals(3000, testImage.data.length);