diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-04-29 13:35:33 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-29 13:35:33 -0700 |
| commit | 8e644062271b4082c6348a5061a75148e0086177 (patch) | |
| tree | 99d8fd18cac4cdc81d2df50a146f86702400ebbf /include | |
| parent | 1d066287d3a515e2a72b50ba36f90777064642b7 (diff) | |
| parent | 17f213bc528cf296e133e9ec9c9e0ce5dce41781 (diff) | |
| download | frameworks_base-8e644062271b4082c6348a5061a75148e0086177.zip frameworks_base-8e644062271b4082c6348a5061a75148e0086177.tar.gz frameworks_base-8e644062271b4082c6348a5061a75148e0086177.tar.bz2 | |
am 17f213b: Merge change 602 into donut
Merge commit '17f213bc528cf296e133e9ec9c9e0ce5dce41781'
* commit '17f213bc528cf296e133e9ec9c9e0ce5dce41781':
Bug fix(1807910): media recorder crash due to the use of locked camera object (last part)
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/Camera.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/ui/Camera.h b/include/ui/Camera.h index 12fa20f..fd851d9 100644 --- a/include/ui/Camera.h +++ b/include/ui/Camera.h @@ -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(); |