diff options
author | Byunghun Jeon <bjeon@codeaurora.org> | 2016-08-10 16:50:11 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-16 16:14:31 -0700 |
commit | 7dfcaf722d00d9fd64b086305579f557efb2b683 (patch) | |
tree | 83091151467c89d2f8840cae7c385c5d38a41698 /src/com/android/camera/PhotoModule.java | |
parent | 904d5069547dcb6a90175558ba3c608f0465d1eb (diff) | |
download | android_packages_apps_Snap-7dfcaf722d00d9fd64b086305579f557efb2b683.tar.gz android_packages_apps_Snap-7dfcaf722d00d9fd64b086305579f557efb2b683.tar.bz2 android_packages_apps_Snap-7dfcaf722d00d9fd64b086305579f557efb2b683.zip |
SnapdragonCamera: Fix crash when switching between camera1, camera2
Camera1 uses CameraHolder for opening/releasing camera and
it does not release right away when closing camera.
This is done to optimize opening/closing but since Camera2
does not use CameraHolder, state is not proper when switching
between camera1 and camera2.
So ignore the timer and release right away when going from
camera1 to camera2.
Change-Id: Ibc40297817ebfca04e19097bd463f78aec4d75cd
CRs-Fixed: 1019338
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 7c0db7c74..279c903d4 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2843,7 +2843,7 @@ public class PhotoModule mCameraDevice.setFaceDetectionCallback(null, null); mCameraDevice.setErrorCallback(null); - if (mActivity.isSecureCamera()) { + if (mActivity.isSecureCamera() || mActivity.isForceReleaseCamera()) { // Blocks until camera is actually released. CameraHolder.instance().strongRelease(); } else { |