| commit | 00f6841c91c4df0e5d9bf86d2593ae9e0e75bcce | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Wed May 18 01:24:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 18 01:24:30 2016 +0000 |
| tree | 4d66b2808e504ac3895629d95de8e0adcfd56f9f | |
| parent | 686b7655ca20d5cc80d5db8a3266a5779fd45acc [diff] | |
| parent | 512c04c5cc25e5a45f707636f76e5f6565909d0c [diff] |
Merge "Fix misc-macro-parentheses warnings." am: 512c04c5cc * commit '512c04c5cc25e5a45f707636f76e5f6565909d0c': Fix misc-macro-parentheses warnings. Change-Id: If880a20b8ea5fdaca0c22d15a4ddeaf506d6c41e
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; }
diff --git a/services/camera/libcameraservice/api1/client2/StreamingProcessor.cpp b/services/camera/libcameraservice/api1/client2/StreamingProcessor.cpp index 75c6f00..66d7b00 100644 --- a/services/camera/libcameraservice/api1/client2/StreamingProcessor.cpp +++ b/services/camera/libcameraservice/api1/client2/StreamingProcessor.cpp
@@ -401,7 +401,6 @@ currentFormat != (uint32_t)mRecordingFormat || currentDataSpace != mRecordingDataSpace) { *needsUpdate = true; - return res; } *needsUpdate = false; return res;