summaryrefslogtreecommitdiffstats
path: root/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-07-12 18:01:31 -0700
committerIgor Murashkin <iam@google.com>2013-07-15 13:37:08 -0700
commitd7bf1778df666e82268d1e4549d248ce3dfc9665 (patch)
tree07556b3fa76172b411d567e1ddb580e8c0981f30 /media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit
parentb9dd637f830e6bd4f257ffb2c807c3ea27f8feee (diff)
downloadframeworks_base-d7bf1778df666e82268d1e4549d248ce3dfc9665.zip
frameworks_base-d7bf1778df666e82268d1e4549d248ce3dfc9665.tar.gz
frameworks_base-d7bf1778df666e82268d1e4549d248ce3dfc9665.tar.bz2
camera2: Implement CameraDevice#getCameraInfo
Bug: 9529161 Change-Id: Ie37d1e07bb8416cbb141f4d49e52337bf7236610
Diffstat (limited to 'media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit')
-rw-r--r--media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java
index 293d6f3..0c2f3a3 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java
@@ -484,7 +484,8 @@ public class CameraMetadataTest extends junit.framework.TestCase {
new AvailableFormat[] {
AvailableFormat.RAW_SENSOR,
AvailableFormat.YV12,
- AvailableFormat.IMPLEMENTATION_DEFINED
+ AvailableFormat.IMPLEMENTATION_DEFINED,
+ AvailableFormat.YCbCr_420_888
});
Key<AeAntibandingMode> availableFormatsKey =
@@ -496,7 +497,8 @@ public class CameraMetadataTest extends junit.framework.TestCase {
int[] expectedIntValues = new int[] {
0x20,
0x32315659,
- 0x22
+ 0x22,
+ 0x23
};
ByteBuffer bf = ByteBuffer.wrap(availableFormatValues).order(ByteOrder.nativeOrder());