commit 5cf01e9d019fe505f6d9b104458afbca6c8685a8
author bohu <bohu@google.com> Tue Jan 16 14:51:37 2018 -0800
committer huans <huans@google.com> Tue Jan 30 16:00:40 2018 -0800
tree 3a4d42ddd18bd309e7454e9396e8ce2bb970b9dc
parent 03f8d09be1e4d48d2093df9f79058de6c04aafcb

camera: enable rotating camera

when qemu.camera.fake.rotating=1 on the kernel command line
i.e.,

emulator -qemu -append "qemu.camera.fake.rotating=1"

Test: manual

Change-Id: I8ccd5e59f745d894a350e94b98f1acdec4589bb3

camera/EmulatedCameraFactory.cpp

diff --git a/camera/EmulatedCameraFactory.cpp b/camera/EmulatedCameraFactory.cpp
index 0dd09e3..3f40aab 100755
--- a/camera/EmulatedCameraFactory.cpp
+++ b/camera/EmulatedCameraFactory.cpp
@@ -445,9 +445,19 @@
                             &HAL_MODULE_INFO_SYM.common);
             break;
         case 3:
-            mEmulatedCameras[mEmulatedCameraNum] =
-                    new EmulatedFakeCamera3(mEmulatedCameraNum, backCamera,
-                            &HAL_MODULE_INFO_SYM.common);
+            {
+                const char *key = "ro.kernel.qemu.camera.fake.rotating";
+                char prop[PROPERTY_VALUE_MAX];
+                if (property_get(key, prop, nullptr) > 0) {
+                    mEmulatedCameras[mEmulatedCameraNum] =
+                        new EmulatedFakeCamera(mEmulatedCameraNum, backCamera,
+                                &HAL_MODULE_INFO_SYM.common);
+                } else {
+                    mEmulatedCameras[mEmulatedCameraNum] =
+                        new EmulatedFakeCamera3(mEmulatedCameraNum, backCamera,
+                                &HAL_MODULE_INFO_SYM.common);
+                }
+            }
             break;
         default:
             ALOGE("%s: Unknown %s camera hal version requested: %d",

camera/EmulatedFakeCamera.cpp

diff --git a/camera/EmulatedFakeCamera.cpp b/camera/EmulatedFakeCamera.cpp
index cc6f2a6..3f03354 100755
--- a/camera/EmulatedFakeCamera.cpp
+++ b/camera/EmulatedFakeCamera.cpp
@@ -37,7 +37,7 @@
           mFacingBack(facingBack),
           mFakeCameraDevice(nullptr)
 {
-    const char *key = "qemu.camera.fake.rotating";
+    const char *key = "ro.kernel.qemu.camera.fake.rotating";
     char prop[PROPERTY_VALUE_MAX];
     if (property_get(key, prop, nullptr) > 0) {
         mFakeCameraDevice = new EmulatedFakeRotatingCameraDevice(this);