From 09a7a0b4e347a08335c086a8de48e938e56d919c Mon Sep 17 00:00:00 2001 From: weijiew Date: Thu, 24 Nov 2016 16:26:02 +0800 Subject: SnapdragonCamera: Camera2 force close after focused Handler message leaks the camera id, the camera id is set to 0 when handleing Message.As we known, rear camera id is 0 and front camera id is 1. Focus action runs normall when switching to rear camera, but focus action will lead to force close when switching to fornt camera. Change-Id: I7795b7cd0c34c256d1ad0066d13a51ed54cec67d CRs-Fixed: 1094009 --- src/com/android/camera/CaptureModule.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 51913f99d..f56fe6f7a 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -1081,6 +1081,7 @@ public class CaptureModule extends BaseModule implements PhotoControl setAFModeToPreview(id, mControlAFMode); Message message = mCameraHandler.obtainMessage( CANCEL_TOUCH_FOCUS, Integer.valueOf(mCameraId[id]), 0); + message.arg1 = id; mCameraHandler.sendMessageDelayed(message, CANCEL_TOUCH_FOCUS_DELAY); } catch (CameraAccessException e) { e.printStackTrace(); -- cgit v1.2.3