| commit | 53529cf975f5247bfa8dfd8bcbaaeb8ceebda3f0 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Tue May 24 17:54:09 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 24 17:54:09 2016 +0000 |
| tree | 7fd2537ebef9dbf7d38dde25d53fb6903696f407 | |
| parent | 9315ef6f963f5e7f13e6dee70b0114f4d4bbdd0e [diff] | |
| parent | 7c05a8e1561b36585cb6a97c1d0d7adbd3cd5520 [diff] |
Merge "Fix misc-macro-parentheses warnings." am: 7c05a8e156 * commit '7c05a8e1561b36585cb6a97c1d0d7adbd3cd5520': Fix misc-macro-parentheses warnings. Change-Id: I383a744a932fa74f5169584456f8354102e7be44
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;