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

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

Merge change 509 into donut 

* changes:
  Fix a media server crash (bug 1807910): part one Add a factory method that creates a Camera object from a remote client
parents e0c49915 f1a53140

include/ui/Camera.h

+2 −2
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ class Camera : public BnCameraClient, public IBinder::DeathRecipient 
{

public:

            // construct a camera client from an existing remote

            Camera(const sp<ICamera>& camera);



            Camera(const sp<ICamera>& camera);  // to be removed

    static  sp<Camera>  create(const sp<ICamera>& camera);

    static  sp<Camera>  connect();

                        ~Camera();

            void        init();

libs/ui/Camera.cpp

+13 −0
Original line number Diff line number Diff line
@@ -75,6 +75,19 @@ Camera::Camera(const sp<ICamera>& camera) 
    }

}





sp<Camera> Camera::create(const sp<ICamera>& camera)

{

    sp<Camera> c = new Camera();

    // connect this client to existing camera remote

    if (camera->connect(c) == NO_ERROR) {

        c->mStatus = NO_ERROR;

        c->mCamera = camera;

        camera->asBinder()->linkToDeath(c);

    }

    return c;

}



void Camera::init()

{

    mStatus = UNKNOWN_ERROR;