summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2016-12-01 09:17:40 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-01 09:17:40 -0800
commit7a280652591b1285af961111f16c6c35ff585401 (patch)
treea396780832690a5a3f6ddf230cdf1ac2f333399b
parentd55245dcd0d5e63652f76b0f1af790905b786ec9 (diff)
parentba7ed3041495777df6a8d832d7bee93c47d760b1 (diff)
downloadandroid_packages_apps_Snap-7a280652591b1285af961111f16c6c35ff585401.tar.gz
android_packages_apps_Snap-7a280652591b1285af961111f16c6c35ff585401.tar.bz2
android_packages_apps_Snap-7a280652591b1285af961111f16c6c35ff585401.zip
Merge "SnapdragonCamera: Camera2 force close after focused" into camera.lnx.1.0-dev.1.0
-rw-r--r--src/com/android/camera/CaptureModule.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 51bb013c5..165f5f82c 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -1186,6 +1186,7 @@ public class CaptureModule implements CameraModule, PhotoController,
mCaptureSession[id].capture(builder.build(), mCaptureCallback, mCameraHandler);
setAFModeToPreview(id, mControlAFMode);
Message message = mCameraHandler.obtainMessage(CANCEL_TOUCH_FOCUS, mCameraId[id]);
+ message.arg1 = id;
mCameraHandler.sendMessageDelayed(message, CANCEL_TOUCH_FOCUS_DELAY);
} catch (CameraAccessException e) {
e.printStackTrace();