diff options
| author | Camera Software Integration <camswint@quicinc.com> | 2019-11-06 23:20:12 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-11-06 23:20:12 -0800 |
| commit | 71569a2e37b09e23ca720b048b47237b0dc6e5ed (patch) | |
| tree | d83acf1e027d1c2f5cb59e4dfda1ae10bc7a4cc3 /src | |
| parent | 0a60a20d24e8124d9a10d2d01d6fd9131123ec18 (diff) | |
| parent | 5c0099676751ad4fdacc1b775751c712865959ee (diff) | |
| download | android_packages_apps_Snap-71569a2e37b09e23ca720b048b47237b0dc6e5ed.tar.gz android_packages_apps_Snap-71569a2e37b09e23ca720b048b47237b0dc6e5ed.tar.bz2 android_packages_apps_Snap-71569a2e37b09e23ca720b048b47237b0dc6e5ed.zip | |
Merge "SnapdragonCamera: Correct the mBackCameraId and mFrontCameraId" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src')
| -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); |