summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoModule.java
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2013-07-31 14:05:20 -0700
committerAngus Kong <shkong@google.com>2013-07-31 15:08:55 -0700
commit9e76552adff6ecf8b8e4070ecd61699cb6d18269 (patch)
treecceb5d9316be13ef82c81e001311395b30257586 /src/com/android/camera/PhotoModule.java
parent6d29a648f497f827d623d7af0b679e98ea58bf90 (diff)
downloadandroid_packages_apps_Snap-9e76552adff6ecf8b8e4070ecd61699cb6d18269.tar.gz
android_packages_apps_Snap-9e76552adff6ecf8b8e4070ecd61699cb6d18269.tar.bz2
android_packages_apps_Snap-9e76552adff6ecf8b8e4070ecd61699cb6d18269.zip
Add wrapper for face detection listener.
bug:10113532 Change-Id: I01dc051d7b25cb97153b5e3e4cf06744dccb9fd4
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rw-r--r--src/com/android/camera/PhotoModule.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 6140848ec..c65a49ef9 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -664,7 +664,7 @@ public class PhotoModule
CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId];
mUI.onStartFaceDetection(mDisplayOrientation,
(info.facing == CameraInfo.CAMERA_FACING_FRONT));
- mCameraDevice.setFaceDetectionListener(mUI);
+ mCameraDevice.setFaceDetectionCallback(mHandler, mUI);
mCameraDevice.startFaceDetection();
}
}
@@ -676,7 +676,7 @@ public class PhotoModule
if (!mFaceDetectionStarted) return;
if (mParameters.getMaxNumDetectedFaces() > 0) {
mFaceDetectionStarted = false;
- mCameraDevice.setFaceDetectionListener(null);
+ mCameraDevice.setFaceDetectionCallback(null, null);
mCameraDevice.stopFaceDetection();
mUI.clearFaces();
}
@@ -1502,7 +1502,7 @@ public class PhotoModule
if (mCameraDevice != null) {
mCameraDevice.setZoomChangeListener(null);
if(ApiHelper.HAS_FACE_DETECTION) {
- mCameraDevice.setFaceDetectionListener(null);
+ mCameraDevice.setFaceDetectionCallback(null, null);
}
mCameraDevice.setErrorCallback(null);
CameraHolder.instance().release();