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

Commit f777ac1a authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 6084 into donut 

* changes:
  Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug 1956726)
parents cf564240 16f3d354

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) {