diff options
author | Mathias Agopian <mathias@google.com> | 2010-07-14 20:16:27 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-14 20:16:27 -0700 |
commit | c74034b6bf0940dc80c4d4efa1e677ad0d2dfd6c (patch) | |
tree | 6888e3fd649f47ecd8937de677475439c97985de /services/camera/libcameraservice/CameraService.cpp | |
parent | 78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f (diff) | |
parent | 24651682edaf71e8a826f23a7ea09bc97c8072c4 (diff) | |
download | frameworks_base-c74034b6bf0940dc80c4d4efa1e677ad0d2dfd6c.zip frameworks_base-c74034b6bf0940dc80c4d4efa1e677ad0d2dfd6c.tar.gz frameworks_base-c74034b6bf0940dc80c4d4efa1e677ad0d2dfd6c.tar.bz2 |
am 24651682: added BinderService<> template to help creating native binder services
Merge commit '24651682edaf71e8a826f23a7ea09bc97c8072c4' into gingerbread-plus-aosp
* commit '24651682edaf71e8a826f23a7ea09bc97c8072c4':
added BinderService<> template to help creating native binder services
Diffstat (limited to 'services/camera/libcameraservice/CameraService.cpp')
-rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 10668a4..c786f94 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -192,11 +192,6 @@ sp<CameraService::Client> CameraService::getClientById(int cameraId) { return mClient[cameraId].promote(); } -void CameraService::instantiate() { - defaultServiceManager()->addService(String16("media.camera"), - new CameraService()); -} - status_t CameraService::onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { // Permission checks |