summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjunjiez <junjiez@codeaurora.org>2016-11-30 14:04:21 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-11-30 01:28:49 -0800
commit5c8b67d31a327feba6555ea5493510c0bf3546ab (patch)
treeed05bf5a185c04a300f6fdfd0eb5451eb3bc3f68 /src
parent86eca94a17aeff7fe1723ecca9a3545292c68de1 (diff)
downloadandroid_packages_apps_Snap-5c8b67d31a327feba6555ea5493510c0bf3546ab.tar.gz
android_packages_apps_Snap-5c8b67d31a327feba6555ea5493510c0bf3546ab.tar.bz2
android_packages_apps_Snap-5c8b67d31a327feba6555ea5493510c0bf3546ab.zip
SnapdragonCamera:Fix crash when zooming
The args of the message CANCEL_TOUCH_FOCUS is wrong, and the handler always get 0 as the cameraId, when mono-only is enabled, the cameraId is 2. Change-Id: Ib6a9a5831d0403bd9d9df6959ed35440ac42cc77 CRs-Fixed: 1092598
Diffstat (limited to 'src')
-rwxr-xr-x[-rw-r--r--]src/com/android/camera/CaptureModule.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 755164325..ab2fb8bbe 100644..100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -1050,7 +1050,8 @@ public class CaptureModule implements CameraModule, PhotoController,
mState[id] = STATE_WAITING_TOUCH_FOCUS;
mCaptureSession[id].capture(builder.build(), mCaptureCallback, mCameraHandler);
setAFModeToPreview(id, mControlAFMode);
- Message message = mCameraHandler.obtainMessage(CANCEL_TOUCH_FOCUS, mCameraId[id]);
+ Message message = mCameraHandler.obtainMessage(
+ CANCEL_TOUCH_FOCUS, Integer.valueOf(mCameraId[id]), 0);
mCameraHandler.sendMessageDelayed(message, CANCEL_TOUCH_FOCUS_DELAY);
} catch (CameraAccessException e) {
e.printStackTrace();