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

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

am a93466f5: Merge change 5220 into donut 

Merge commit 'a93466f5ca41c2ba6c3524c8d1edc2138bf753e3'

* commit 'a93466f5ca41c2ba6c3524c8d1edc2138bf753e3':
  Cleanup header file. Disallow copy of Camera object by making copy
parents 3fc010e7 ae0dcb53

include/ui/Camera.h

+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