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

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

Merge change 602 into donut 

* changes:
  Bug fix(1807910): media recorder crash due to the use of locked camera object (last part) - remove an unused Camera constructor - add a check on the argument in Camera::create() method
parents 6aefee92 d2dc9ac8

include/ui/Camera.h

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ class Camera : public BnCameraClient, public IBinder::DeathRecipient 
{

public:

            // construct a camera client from an existing remote

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

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

    static  sp<Camera>  connect();

                        ~Camera();

libs/ui/Camera.cpp

+7 −13
Original line number Diff line number Diff line
@@ -64,22 +64,16 @@ Camera::Camera() 
    init();

}



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

// construct a camera client from an existing camera remote

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

{

    init();

    // connect this client to existing camera remote

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

        mStatus = NO_ERROR;

        mCamera = camera;

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

    }

     LOGV("create");

     if (camera == 0) {

         LOGE("camera remote is a NULL pointer");

         return 0;

     }





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;