Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93f593fd authored by Ruben Brunk's avatar Ruben Brunk Committed by Android (Google) Code Review
Browse files

Merge "camera: Add eviction errorcode to Camera1 API."

parents 1a3c3303 e91b9254

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -12608,6 +12608,7 @@ package android.hardware { 
    method public final void unlock();

    field public static final java.lang.String ACTION_NEW_PICTURE = "android.hardware.action.NEW_PICTURE";

    field public static final java.lang.String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO";

    field public static final int CAMERA_ERROR_EVICTED = 2; // 0x2

    field public static final int CAMERA_ERROR_SERVER_DIED = 100; // 0x64

    field public static final int CAMERA_ERROR_UNKNOWN = 1; // 0x1

  }

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -12902,6 +12902,7 @@ package android.hardware { 
    method public final void unlock();

    field public static final java.lang.String ACTION_NEW_PICTURE = "android.hardware.action.NEW_PICTURE";

    field public static final java.lang.String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO";

    field public static final int CAMERA_ERROR_EVICTED = 2; // 0x2

    field public static final int CAMERA_ERROR_SERVER_DIED = 100; // 0x64

    field public static final int CAMERA_ERROR_UNKNOWN = 1; // 0x1

  }

core/java/android/hardware/Camera.java

+6 −2
Original line number Diff line number Diff line
@@ -1803,14 +1803,18 @@ public class Camera { 
        public Point mouth = null;

    }



    // Error codes match the enum in include/ui/Camera.h



    /**

     * Unspecified camera error.

     * @see Camera.ErrorCallback

     */

    public static final int CAMERA_ERROR_UNKNOWN = 1;



    /**

     * Camera was disconnected due to use by higher priority user.

     * @see Camera.ErrorCallback

     */

    public static final int CAMERA_ERROR_EVICTED = 2;



    /**

     * Media server died. In this case, the application must release the

     * Camera object and instantiate a new one.