diff options
| author | Mathias Agopian <mathias@google.com> | 2010-07-14 20:18:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-14 20:18:50 -0700 |
| commit | 53459436ed17f46d695d061b08e952a00d679ae6 (patch) | |
| tree | 8bf0e718e33156e37d5f7be95346d83336596608 /services/camera/libcameraservice/CameraService.cpp | |
| parent | 0779682a490f12f102cd0cf1e768e3c68cfdc512 (diff) | |
| parent | c74034b6bf0940dc80c4d4efa1e677ad0d2dfd6c (diff) | |
| download | frameworks_base-53459436ed17f46d695d061b08e952a00d679ae6.zip frameworks_base-53459436ed17f46d695d061b08e952a00d679ae6.tar.gz frameworks_base-53459436ed17f46d695d061b08e952a00d679ae6.tar.bz2 | |
am c74034b6: am 24651682: added BinderService<> template to help creating native binder services
Merge commit 'c74034b6bf0940dc80c4d4efa1e677ad0d2dfd6c'
* commit 'c74034b6bf0940dc80c4d4efa1e677ad0d2dfd6c':
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 |