diff options
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | src/com/android/camera/Camera.java | 8 |
2 files changed, 4 insertions, 6 deletions
@@ -6,7 +6,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := Camera -#LOCAL_SDK_VERSION := current +LOCAL_SDK_VERSION := current LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index ee496ca..7ac3023 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -517,20 +517,18 @@ public class Camera extends ActivityBase implements View.OnClickListener, } private void startFaceDetection() { - if (mParameters.getMaxNumDetectedFaces( - android.hardware.Camera.CAMERA_FACE_DETECTION_HW) > 0) { + if (mParameters.getMaxNumDetectedFaces() > 0) { if (mFaceListener == null) { mFaceListener = new FaceListener(this, (ViewGroup) findViewById(R.id.frame), mDisplayOrientation); } mCameraDevice.setFaceDetectionListener(mFaceListener); - mCameraDevice.startFaceDetection(android.hardware.Camera.CAMERA_FACE_DETECTION_HW); + mCameraDevice.startFaceDetection(); } } private void stopFaceDetection() { - if (mParameters.getMaxNumDetectedFaces( - android.hardware.Camera.CAMERA_FACE_DETECTION_HW) > 0) { + if (mParameters.getMaxNumDetectedFaces() > 0) { mCameraDevice.setFaceDetectionListener(null); mCameraDevice.stopFaceDetection(); } |