diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-04-23 15:58:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-04-23 15:58:38 -0700 |
| commit | 0a9b5bbb47a965238ca0e1e699d61d7ddd054742 (patch) | |
| tree | 4a6f50aed3f4be6c55f7a50c54b756a60643120b /include | |
| parent | 5616a7d1dea1aecc8353bab144d14446aa33391a (diff) | |
| parent | 2adc2dbbd65fc89983f20702db2004f9b8cf8258 (diff) | |
| download | frameworks_base-0a9b5bbb47a965238ca0e1e699d61d7ddd054742.zip frameworks_base-0a9b5bbb47a965238ca0e1e699d61d7ddd054742.tar.gz frameworks_base-0a9b5bbb47a965238ca0e1e699d61d7ddd054742.tar.bz2 | |
Merge change 509 into donut
* changes:
Fix a media server crash (bug 1807910): part one Add a factory method that creates a Camera object from a remote client
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/Camera.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/ui/Camera.h b/include/ui/Camera.h index e593fea..12fa20f 100644 --- a/include/ui/Camera.h +++ b/include/ui/Camera.h @@ -78,8 +78,8 @@ class Camera : public BnCameraClient, public IBinder::DeathRecipient { public: // construct a camera client from an existing remote - Camera(const sp<ICamera>& camera); - + Camera(const sp<ICamera>& camera); // to be removed + static sp<Camera> create(const sp<ICamera>& camera); static sp<Camera> connect(); ~Camera(); void init(); |