commit e7eaf972ab053594101674ed190bbf12482724b6
author huans <huans@google.com> Fri Aug 18 15:13:37 2017 -0700
committer Huan Song <huans@google.com> Mon Jan 29 20:22:40 2018 +0000
tree 8100e95d5dcee29749b16c7c800ebab70a4976c0
parent a8d92cb2a540a464516067dac0357c65067d6b15

O-CTS Camera, fix ExtendedCameraCharacteristicsTest#testAvailableStreamConfigs

Bug: 64847707
Test: run cts -m CameraTestCases -t
android.hardware.camera2.cts.ExtendedCameraCharacteristicsTest#testAvailableStreamConfigs
run cts -m CtsProviderTestCases -t android.provider.cts.MediaStoreUiTest#testImageCapture

Change-Id: I2bcd08df36e24a310d75c2bc702fb0944ad4f764
(cherry picked from commit 53d57023f2ffdea044f5c53455604f1546237e6b)

camera/EmulatedFakeCamera.cpp

diff --git a/camera/EmulatedFakeCamera.cpp b/camera/EmulatedFakeCamera.cpp
index 57b543b..d706b22 100755
--- a/camera/EmulatedFakeCamera.cpp
+++ b/camera/EmulatedFakeCamera.cpp
@@ -75,16 +75,16 @@
    /* 352x288, 320x240 and 176x144 frame dimensions are required by
      * the framework for video mode preview and video recording. */
     mParameters.set(CameraParameters::KEY_SUPPORTED_PICTURE_SIZES,
-                    "1920x1440,640x480,352x288,320x240");
+                    "1280x720,640x480,352x288,320x240");
     mParameters.set(CameraParameters::KEY_SUPPORTED_PREVIEW_SIZES,
-                    "1920x1440,640x480,352x288,320x240,176x144");
+                    "1280x720,640x480,352x288,320x240,176x144");
     mParameters.set(CameraParameters::KEY_SUPPORTED_VIDEO_SIZES,
-                    "1920x1440,640x480,352x288,320x240,176x144");
+                    "1280x720,640x480,352x288,320x240,176x144");
     mParameters.set(CameraParameters::KEY_PREFERRED_PREVIEW_SIZE_FOR_VIDEO,
-                    "1920x1440");
+                    "1280x720");
 
-    mParameters.setPreviewSize(1920, 1440);
-    mParameters.setPictureSize(1920, 1440);
+    mParameters.setPictureSize(1280, 720);
+    mParameters.setPictureSize(1280, 720);
 
     return NO_ERROR;
 }