commit c4d810a43ce5d052812a453b488ef0cc7511dfda
author Jean-Baptiste Queru <jbq@google.com> Mon Nov 28 11:27:17 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 28 11:27:17 2011 -0800
tree 2ff82250d26936c5859a080180a67c9d477e826e
parent 2400b2c3402e6585437274f8acd5fd6e32367bb3
parent cf2051ab22acd2a2d6f734c3cba4265b7a5a0710

Merge "Inaccvrate Morse data in sample code." into ics-mr0

sdk/support_source.properties

diff --git a/sdk/support_source.properties b/sdk/support_source.properties
index 16d5cd8..1aeb2c1 100644
--- a/sdk/support_source.properties
+++ b/sdk/support_source.properties
@@ -1,5 +1,5 @@
 Pkg.UserSrc=false
-Pkg.Revision=4
+Pkg.Revision=5
 Extra.Vendor=android
 Extra.Path=support
 Extra.OldPaths=compatibility

tools/emulator/system/camera/EmulatedFakeCamera.cpp

diff --git a/tools/emulator/system/camera/EmulatedFakeCamera.cpp b/tools/emulator/system/camera/EmulatedFakeCamera.cpp
index d82fd78..86b9d08 100755
--- a/tools/emulator/system/camera/EmulatedFakeCamera.cpp
+++ b/tools/emulator/system/camera/EmulatedFakeCamera.cpp
@@ -69,8 +69,12 @@
      * Parameters provided by the camera device.
      */
 
-    mParameters.set(CameraParameters::KEY_SUPPORTED_PICTURE_SIZES, "640x480");
-    mParameters.set(CameraParameters::KEY_SUPPORTED_PREVIEW_SIZES, "640x480");
+    /* 352x288 and 320x240 frame dimensions are required by the framework for
+     * video mode preview and video recording. */
+    mParameters.set(CameraParameters::KEY_SUPPORTED_PICTURE_SIZES,
+                    "640x480,352x288,320x240");
+    mParameters.set(CameraParameters::KEY_SUPPORTED_PREVIEW_SIZES,
+                    "640x480,352x288,320x240");
     mParameters.setPreviewSize(640, 480);
     mParameters.setPictureSize(640, 480);
 

tools/emulator/system/camera/EmulatedFakeCameraDevice.h

diff --git a/tools/emulator/system/camera/EmulatedFakeCameraDevice.h b/tools/emulator/system/camera/EmulatedFakeCameraDevice.h
index f54127e..0213ae9 100755
--- a/tools/emulator/system/camera/EmulatedFakeCameraDevice.h
+++ b/tools/emulator/system/camera/EmulatedFakeCameraDevice.h
@@ -32,7 +32,7 @@
  * "white/red/green/blue" frame. Frame content rotation helps finding bugs in
  * format conversions.
  */
-#define EFCD_ROTATE_FRAME   1
+#define EFCD_ROTATE_FRAME   0
 
 namespace android {