| commit | 37e7086b9417038502aee747b00fd27f75223949 | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Wed Mar 25 11:18:52 2015 -0700 |
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | Wed Mar 25 11:18:52 2015 -0700 |
| tree | 9da33fbe5feb67671ce1b4d7de2d5ca679d898de | |
| parent | 69efaa1702194d4f6612136ec367fab27b801d9c [diff] |
DO NOT MERGE: camera: WAR for rounding width Bug: 19930700 Change-Id: I601fe71c70ed6d825fac148b64ab94df0a4f5844
diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java index 02dfccd..9cd3df6 100644 --- a/tests/tests/hardware/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java +++ b/tests/tests/hardware/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
@@ -539,7 +539,10 @@ // Try an invalid size in this format, should round Size invalidSize = findInvalidSize(supportedSizes); - int MAX_ROUNDING_WIDTH = 1920; + // WAR: the intended threshold is 1920, but to counter the bug + // in Lollipop framework, we need to set it to 1080 here. + // The threshold will be changed back to 1920 in next Android release. + int MAX_ROUNDING_WIDTH = 1080; if (invalidSize.getWidth() <= MAX_ROUNDING_WIDTH) { ImageReader testReader = ImageReader.newInstance( invalidSize.getWidth(),