| commit | 99fae11f91fa84ea1eccfbcdea8f52c2f4ed118d | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Thu Jun 02 02:40:06 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 02 02:40:06 2016 +0000 |
| tree | 4752dd821abe72b9f6cf8326b2e8e1197333c129 | |
| parent | 05ee439516f5e1887f2581502e71db0eef1f66d8 [diff] | |
| parent | b04266c68ffc0c0b302302498e6d54cd7d54ad43 [diff] |
Merge "Fix camera2.cts.CameraManagerTest.testManagerGetDeviceIdList for TV." into marshmallow-cts-dev am: 96e1f8c545 am: f641dbcf53 am: e366a5e7f3 am: b04266c68f * commit 'b04266c68ffc0c0b302302498e6d54cd7d54ad43': Fix camera2.cts.CameraManagerTest.testManagerGetDeviceIdList for TV. Change-Id: Idb468e2ea988c71b40709f94701eb5b5e8748448
diff --git a/tests/camera/src/android/hardware/camera2/cts/helpers/StaticMetadata.java b/tests/camera/src/android/hardware/camera2/cts/helpers/StaticMetadata.java index e892e42..141bfac 100644 --- a/tests/camera/src/android/hardware/camera2/cts/helpers/StaticMetadata.java +++ b/tests/camera/src/android/hardware/camera2/cts/helpers/StaticMetadata.java
@@ -2087,7 +2087,7 @@ checkTrueForKey(key, " value is out of range ", facing >= CameraCharacteristics.LENS_FACING_FRONT && - facing <= CameraCharacteristics.LENS_FACING_BACK); + facing <= CameraCharacteristics.LENS_FACING_EXTERNAL); return facing; }