commit c3c06c4fe329d07bd7d442206bc9eb63e92bf5bd
author Yin-Chia Yeh <yinchiayeh@google.com> Tue Apr 26 17:29:59 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 26 17:30:00 2016 +0000
tree f9ca73d77e2af217c3436154d5be73ef5ddf06dd
parent 1302f9ddd27c89f73cc7790d518f8fc88d89560c
parent 9b5a6e9a667f85adeddea787a9f609d9cde84ef4

Merge "Camera: override external facing for API1 client" into nyc-dev

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index fcb72e8..13691e7 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -464,6 +464,12 @@
     if (rc.isOk()) {
         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;
 }