diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-06-14 10:41:23 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-06-14 10:41:23 -0700 |
| commit | 5a478c28b24693f84079f58b2b3cd0d106081b2d (patch) | |
| tree | f7087e6c5e6494434a1f23674c47106a34db2b29 | |
| parent | d43f6021c92a0ae14d9e23183e2456843a711dff (diff) | |
| parent | 1e9cb0add9c5e5b0a2fe953aa12b84e6440bdf51 (diff) | |
| download | android_packages_apps_Snap-5a478c28b24693f84079f58b2b3cd0d106081b2d.tar.gz android_packages_apps_Snap-5a478c28b24693f84079f58b2b3cd0d106081b2d.tar.bz2 android_packages_apps_Snap-5a478c28b24693f84079f58b2b3cd0d106081b2d.zip | |
Merge "fix camera app cannot handle intent extras.CAMERA_FACING" into camera-SnapdragonCamera.lnx.2.0
| -rwxr-xr-x | src/com/android/camera/CameraHolder.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraHolder.java b/src/com/android/camera/CameraHolder.java index 59b305bc6..d5167af5b 100755 --- a/src/com/android/camera/CameraHolder.java +++ b/src/com/android/camera/CameraHolder.java @@ -184,6 +184,9 @@ public class CameraHolder { int facing = characteristics.get(CameraCharacteristics.LENS_FACING); if (facing == CameraCharacteristics.LENS_FACING_FRONT) { CaptureModule.FRONT_ID = i; + mFrontCameraId = i; + } else if (mBackCameraId != -1) { + mBackCameraId = i; } mCharacteristics.add(i, characteristics); } |