commit cdf7931424583ff20a754999216041fb46287cb3
author Yin-Chia Yeh <yinchiayeh@google.com> Tue Apr 26 21:34:30 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 26 21:34:30 2016 +0000
tree b93d610e465cfac63e17245e166e5b19ca765882
parent 86873be315bcc8e3aceb66e41825bacba85a112f
parent 0b094277076286d100cf1da6860b7038be662ce9

Merge "DO NOT MERGE: Camera: override external facing for API1 client"

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 45ef1f8..4119140 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -444,6 +444,12 @@
         mModule->getCameraInfo(cameraId, &info));
     cameraInfo->facing = info.facing;
     cameraInfo->orientation = info.orientation;
+    // 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;
+    }
     return rc;
 }