diff options
| author | xianming wang <mingwax@codeaurora.org> | 2019-10-30 15:37:42 +0800 |
|---|---|---|
| committer | xianming wang <mingwax@codeaurora.org> | 2019-10-30 15:41:04 +0800 |
| commit | 5c0099676751ad4fdacc1b775751c712865959ee (patch) | |
| tree | 686e50cff2a46e3645da35637d58713f8e600fb5 | |
| parent | 240a5a28559c5fd2e5fc54ec5bd77d73bcf9e9ea (diff) | |
| download | android_packages_apps_Snap-5c0099676751ad4fdacc1b775751c712865959ee.tar.gz android_packages_apps_Snap-5c0099676751ad4fdacc1b775751c712865959ee.tar.bz2 android_packages_apps_Snap-5c0099676751ad4fdacc1b775751c712865959ee.zip | |
SnapdragonCamera: Correct the mBackCameraId and mFrontCameraId
Correct the mBackCameraId and mFrontCameraId.
Change-Id: I10904c601801c89b89f1fb21468d5c7a420bfb4a
| -rwxr-xr-x | src/com/android/camera/CameraHolder.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraHolder.java b/src/com/android/camera/CameraHolder.java index d5167af5b..f7ee1af88 100755 --- a/src/com/android/camera/CameraHolder.java +++ b/src/com/android/camera/CameraHolder.java @@ -23,6 +23,7 @@ import android.hardware.Camera.CameraInfo; import android.hardware.Camera.Parameters; import android.hardware.camera2.CameraAccessException; import android.hardware.camera2.CameraCharacteristics; +import android.hardware.camera2.CameraMetadata; import android.os.Build; import android.os.Handler; import android.os.HandlerThread; @@ -182,10 +183,10 @@ public class CameraHolder { = manager.getCameraCharacteristics(cameraId); Log.d(TAG,"cameraIdList size ="+cameraIdList.length); int facing = characteristics.get(CameraCharacteristics.LENS_FACING); - if (facing == CameraCharacteristics.LENS_FACING_FRONT) { + if (mFrontCameraId == -1 && facing == CameraMetadata.LENS_FACING_FRONT) { CaptureModule.FRONT_ID = i; mFrontCameraId = i; - } else if (mBackCameraId != -1) { + } else if (mBackCameraId == -1 && facing == CameraMetadata.LENS_FACING_BACK) { mBackCameraId = i; } mCharacteristics.add(i, characteristics); |