Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 5220 into donut

Browse Source 
* changes:
  Cleanup header file. Disallow copy of Camera object by making copy constructor and operator= private.
This commit is contained in:
Android (Google) Code Review
2009-06-24 12:26:02 -07:00
parent 54118adb37 6f0602e84a
commit a93466f5ca
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/ui/Camera.h
View File

@@ -94,11 +94,6 @@ public:
virtual void postData(int32_t msgType, const sp<IMemory>& dataPtr) = 0; 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 class Camera : public BnCameraClient, public IBinder::DeathRecipient
{ {
public: public:
@@ -163,6 +158,8 @@ public:
private: private:
Camera(); Camera();
Camera(const Camera&);
Camera& operator=(const Camera);
virtual void binderDied(const wp<IBinder>& who); virtual void binderDied(const wp<IBinder>& who);
class DeathNotifier: public IBinder::DeathRecipient class DeathNotifier: public IBinder::DeathRecipient