Merge "Remove new camera open API."

Author: Wu-cheng Li

core/java/android/hardware/Camera.java

@@ -233,48 +233,6 @@ public static class CameraInfo {
         public int orientation;
     };
 
-    /**
-     * Creates a new Camera object to access a particular hardware camera.
-     *
-     * <p>When <code>force</code> is set to false, this will throw an exception
-     * if the same camera is already opened by other clients. If true, the other
-     * client will be disconnected from the camera they opened. If the device
-     * can only support one camera running at a time, all camera-using clients
-     * will be disconnected from their cameras.
-     *
-     * <p>A camera being held by an application can be taken away by other
-     * applications at any time. Before the camera is taken, applications will
-     * get {@link #CAMERA_ERROR_RELEASED} and have some time to clean up. Apps
-     * receiving this callback must immediately stop video recording and then
-     * call {@link #release()} on their camera object. Otherwise, it will be
-     * released by the frameworks in a short time. After receiving
-     * CAMERA_ERROR_RELEASED, apps should not call any method except <code>
-     * release</code> and {@link #isReleased()}. After a camera is taken away,
-     * all methods will throw exceptions except <code>isReleased</code> and
-     * <code>release</code>. Apps can use <code>isReleased</code> to see if the
-     * camera has been taken away. If the camera is taken away, the apps can
-     * silently finish themselves or show a dialog.
-     *
-     * <p>Applications with android.permission.KEEP_CAMERA can request to keep
-     * the camera. That is, the camera will not be taken by other applications
-     * while it is opened. The permission can only be obtained by trusted
-     * platform applications, such as those implementing lock screen security
-     * features.
-     *
-     * @param cameraId the hardware camera to access, between 0 and
-     *     {@link #getNumberOfCameras()}-1.
-     * @param force true to take the ownership from the existing client if the
-     *     camera has been opened by other clients.
-     * @param keep true if the applications do not want other apps to take the
-     *     camera. Only the apps with android.permission.KEEP_CAMERA can keep
-     *     the camera.
-     * @return a new Camera object, connected, locked and ready for use.
-     * @hide
-     */
-    public static Camera open(int cameraId, boolean force, boolean keep) {
-        return new Camera(cameraId, force, keep);
-    }
-
     /**
      * Creates a new Camera object to access a particular hardware camera. If
      * the same camera is opened by other applications, this will throw a
@@ -305,7 +263,7 @@ public static Camera open(int cameraId, boolean force, boolean keep) {
      * @see android.app.admin.DevicePolicyManager#getCameraDisabled(android.content.ComponentName)
      */
     public static Camera open(int cameraId) {
-        return new Camera(cameraId, false, false);
+        return new Camera(cameraId);
     }
 
     /**
@@ -320,13 +278,13 @@ public static Camera open() {
         for (int i = 0; i < numberOfCameras; i++) {
             getCameraInfo(i, cameraInfo);
             if (cameraInfo.facing == CameraInfo.CAMERA_FACING_BACK) {
-                return new Camera(i, false, false);
+                return new Camera(i);
             }
         }
         return null;
     }
 
-    Camera(int cameraId, boolean force, boolean keep) {
+    Camera(int cameraId) {
         mShutterCallback = null;
         mRawImageCallback = null;
         mJpegCallback = null;
@@ -343,7 +301,7 @@ public static Camera open() {
             mEventHandler = null;
         }
 
-        native_setup(new WeakReference<Camera>(this), cameraId, force, keep);
+        native_setup(new WeakReference<Camera>(this), cameraId);
     }
 
     /**
@@ -356,8 +314,7 @@ protected void finalize() {
         release();
     }
 
-    private native final void native_setup(Object camera_this, int cameraId,
-            boolean force, boolean keep);
+    private native final void native_setup(Object camera_this, int cameraId);
     private native final void native_release();
 
 
@@ -371,18 +328,6 @@ public final void release() {
         mFaceDetectionRunning = false;
     }
 
-    /**
-     * Whether the camera is released. When any camera method throws an
-     * exception, applications can use this to check whether the camera has been
-     * taken by other clients. If true, it means other clients have taken the
-     * camera. The applications can silently finish themselves or show a dialog.
-     *
-     * @return whether the camera is released.
-     * @see #open(int, boolean, boolean)
-     * @hide
-     */
-    public native final boolean isReleased();
-
     /**
      * Unlocks the camera to allow another process to access it.
      * Normally, the camera is locked to the process with an active Camera
@@ -1376,17 +1321,6 @@ public Face() {
      */
     public static final int CAMERA_ERROR_UNKNOWN = 1;
 
-    /**
-     * Camera was released because another client has opened the camera. The
-     * application should call {@link #release()} after getting this. The apps
-     * should not call any method except <code>release</code> and {@link #isReleased()}
-     * after this.
-     *
-     * @see Camera.ErrorCallback
-     * @hide
-     */
-    public static final int CAMERA_ERROR_RELEASED = 2;
-
     /**
      * Media server died. In this case, the application must release the
      * Camera object and instantiate a new one.

core/jni/android_hardware_Camera.cpp

@@ -457,9 +457,9 @@ static void android_hardware_Camera_getCameraInfo(JNIEnv *env, jobject thiz,
 
 // connect to camera service
 static void android_hardware_Camera_native_setup(JNIEnv *env, jobject thiz,
-    jobject weak_this, jint cameraId, jboolean force, jboolean keep)
+    jobject weak_this, jint cameraId)
 {
-    sp<Camera> camera = Camera::connect(cameraId, force, keep);
+    sp<Camera> camera = Camera::connect(cameraId);
 
     if (camera == NULL) {
         jniThrowRuntimeException(env, "Fail to connect to camera service");
@@ -821,15 +821,6 @@ static void android_hardware_Camera_enableFocusMoveCallback(JNIEnv *env, jobject
     }
 }
 
-static bool android_hardware_Camera_isReleased(JNIEnv *env, jobject thiz)
-{
-    ALOGV("isReleased");
-    sp<Camera> camera = get_native_camera(env, thiz, NULL);
-    if (camera == 0) return true;
-
-    return (camera->sendCommand(CAMERA_CMD_PING, 0, 0) != NO_ERROR);
-}
-
 //-------------------------------------------------
 
 static JNINativeMethod camMethods[] = {
@@ -840,7 +831,7 @@ static JNINativeMethod camMethods[] = {
     "(ILandroid/hardware/Camera$CameraInfo;)V",
     (void*)android_hardware_Camera_getCameraInfo },
   { "native_setup",
-    "(Ljava/lang/Object;IZZ)V",
+    "(Ljava/lang/Object;I)V",
     (void*)android_hardware_Camera_native_setup },
   { "native_release",
     "()V",
@@ -908,9 +899,6 @@ static JNINativeMethod camMethods[] = {
   { "enableFocusMoveCallback",
     "(I)V",
     (void *)android_hardware_Camera_enableFocusMoveCallback},
-  { "isReleased",
-    "()Z",
-    (void *)android_hardware_Camera_isReleased},
 };
 
 struct field {