commit e67f6da3673a6596a1058598c6cd4a9ed9cfdf15
author Yin-Chia Yeh <yinchiayeh@google.com> Wed Nov 30 00:53:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 30 00:53:08 2016 +0000
tree f6609b6a35d4a76773b1077b204d2a7d4ed462ab
parent 002e6c6452e4136a56a458c0a4929fb0dd6b489f
parent 13cd59a7ea9110546088e76f9c844503fa638850

Camera: fix camera facing override logic
am: 13cd59a7ea

Change-Id: Id2f4f8a02843ad90cd4a61d1223346361e88e18a

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index dd9029e..85faac6 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -470,8 +470,8 @@
         // CameraInfo is for android.hardware.Camera which does not
         // support external camera facing. The closest approximation would be
         // front camera.
-        if (cameraInfo->orientation == CAMERA_FACING_EXTERNAL) {
-            cameraInfo->orientation = CAMERA_FACING_FRONT;
+        if (cameraInfo->facing == CAMERA_FACING_EXTERNAL) {
+            cameraInfo->facing = CAMERA_FACING_FRONT;
         }
     }
     return rc;
@@ -2556,7 +2556,8 @@
                 write(fd, result.string(), result.size());
             } else {
                 result.appendFormat("  Facing: %s\n",
-                        info.facing == CAMERA_FACING_BACK ? "BACK" : "FRONT");
+                        info.facing == CAMERA_FACING_BACK ? "BACK" :
+                                info.facing == CAMERA_FACING_FRONT ? "FRONT" : "EXTERNAL");
                 result.appendFormat("  Orientation: %d\n", info.orientation);
                 int deviceVersion;
                 if (mModule->getModuleApiVersion() < CAMERA_MODULE_API_VERSION_2_0) {