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

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

Merge change 5220 into donut

* changes:
  Cleanup header file. Disallow copy of Camera object by making copy constructor and operator= private.
parents 6441a76b f5a8faa7
Loading
Loading
Loading
Loading
+2 −5
Original line number Diff line number Diff line
@@ -94,11 +94,6 @@ public:
    virtual void postData(int32_t msgType, const sp<IMemory>& dataPtr) = 0;
};

typedef void (*shutter_callback)(void *cookie);
typedef void (*frame_callback)(const sp<IMemory>& mem, void *cookie);
typedef void (*autofocus_callback)(bool focused, void *cookie);
typedef void (*error_callback)(status_t err, void *cookie);

class Camera : public BnCameraClient, public IBinder::DeathRecipient
{
public:
@@ -163,6 +158,8 @@ public:

private:
                        Camera();
                        Camera(const Camera&);
                        Camera& operator=(const Camera);
                        virtual void binderDied(const wp<IBinder>& who);

            class DeathNotifier: public IBinder::DeathRecipient