summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2016-12-11 04:22:27 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-11 04:22:27 -0800
commitad446334f0b6b12939c8bf406586e93bb7de2403 (patch)
tree857aec51e38eb349b4cd0b3732ac2f130bd3aa44
parentbac6ab2a9bd02955ff43933209c815d0383f049d (diff)
parent693ea9084f0e766b287a4ede565bbebb865ed127 (diff)
downloadandroid_packages_apps_Snap-ad446334f0b6b12939c8bf406586e93bb7de2403.tar.gz
android_packages_apps_Snap-ad446334f0b6b12939c8bf406586e93bb7de2403.tar.bz2
android_packages_apps_Snap-ad446334f0b6b12939c8bf406586e93bb7de2403.zip
Merge "SnapdragonCamera:closing sequence improvement" into camera.lnx.1.0-dev.1.0
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index de3f65c73..69efde7c2 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -535,8 +535,6 @@ public class CaptureModule implements CameraModule, PhotoController,
public void onError(CameraDevice cameraDevice, int error) {
int id = Integer.parseInt(cameraDevice.getId());
Log.e(TAG, "onError " + id + " " + error);
- cameraDevice.close();
- mCameraDevice[id] = null;
mCameraOpenCloseLock.release();
mCamerasOpened = false;
if (null != mActivity) {