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

Commit fee47b69 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am c7396025: Merge change 6084 into donut 

Merge commit 'c7396025'

* commit 'c7396025':
  Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug 1956726)
parents 1eebdc04 c7396025

core/java/android/hardware/Camera.java

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ public class Camera { 
    }

    private native final void native_takePicture();



    // These match the enum in libs/android_runtime/android_hardware_Camera.cpp

    // These match the enum in include/ui/Camera.h

    /** Unspecified camerar error.  @see #ErrorCallback */

    public static final int CAMERA_ERROR_UNKNOWN = 1;

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

core/jni/android_hardware_Camera.cpp

+0 −6
Original line number Diff line number Diff line
@@ -38,12 +38,6 @@ enum CallbackMessageID { 
    kErrorCallback = 5

};



enum CameraError {

    kCameraErrorUnknown = 1,

    kCameraErrorMediaServer = 100

};





struct fields_t {

    jfieldID    context;

    jfieldID    surface;

include/ui/Camera.h

+6 −0
Original line number Diff line number Diff line
@@ -76,6 +76,12 @@ enum { 
    CAMERA_MSG_COMPRESSED_IMAGE

};



// camera fatal errors

enum {

    CAMERA_ERROR_UKNOWN  = 1,

    CAMERA_ERROR_SERVER_DIED = 100

};



class ICameraService;

class ICamera;

class Surface;

libs/ui/Camera.cpp

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ void Camera::dataCallback(int32_t msgType, const sp<IMemory>& dataPtr) 


void Camera::binderDied(const wp<IBinder>& who) {

    LOGW("ICamera died");

    notifyCallback(CAMERA_MSG_ERROR, DEAD_OBJECT, 0);

    notifyCallback(CAMERA_MSG_ERROR, CAMERA_ERROR_SERVER_DIED, 0);

}



void Camera::DeathNotifier::binderDied(const wp<IBinder>& who) {