commit 98a9b2a491360c762e2ed46a9126f576693645a5
author Chih-Hung Hsieh <chh@google.com> Mon May 02 18:53:31 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 02 18:53:31 2016 +0000
tree c96d3bec8c75feae06d6157a7c8ead75602c395b
parent be975e1c2a3153b74ab4341e2bcc57f3f25db71c
parent e7d3c72f23384774407248edcbfc9c9d78bfe304

Merge "Fix google-explicit-constructor warnings."
am: e7d3c72f23

* commit 'e7d3c72f23384774407248edcbfc9c9d78bfe304':
  Fix google-explicit-constructor warnings.

Change-Id: I7ff1a09d757b71252db243b6527f6c131d11c4a6

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 4119140..45ef1f8 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -444,12 +444,6 @@
         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;
 }