diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2015-05-20 20:44:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-20 20:44:15 +0000 |
| commit | 2232aee25e4df7d04446912e8ad9e9dc44d8ec16 (patch) | |
| tree | 069b67ffba5507b89d75bc27a2c14ca0f625b6f9 /services/camera | |
| parent | 523d08709ba4a0124eb2117907d79113fbe00cfb (diff) | |
| parent | 2823ce0ce6f9d508a07de20912c93cce9165027f (diff) | |
| download | frameworks_av-2232aee25e4df7d04446912e8ad9e9dc44d8ec16.zip frameworks_av-2232aee25e4df7d04446912e8ad9e9dc44d8ec16.tar.gz frameworks_av-2232aee25e4df7d04446912e8ad9e9dc44d8ec16.tar.bz2 | |
Merge "camera: Add AIDL interface for CameraServiceProxy." into mnc-dev
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 13 | ||||
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 82aa566..79e73f9 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -33,6 +33,7 @@ #include <binder/MemoryBase.h> #include <binder/MemoryHeapBase.h> #include <binder/ProcessInfoService.h> +#include <camera/ICameraServiceProxy.h> #include <cutils/atomic.h> #include <cutils/properties.h> #include <gui/Surface.h> @@ -224,6 +225,18 @@ void CameraService::onFirstRef() } CameraDeviceFactory::registerService(this); + + CameraService::pingCameraServiceProxy(); +} + +void CameraService::pingCameraServiceProxy() { + sp<IServiceManager> sm = defaultServiceManager(); + sp<IBinder> binder = sm->getService(String16("media.camera.proxy")); + if (binder == nullptr) { + return; + } + sp<ICameraServiceProxy> proxyBinder = interface_cast<ICameraServiceProxy>(binder); + proxyBinder->pingForUserUpdate(); } CameraService::~CameraService() { diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index 9b7163a..ce3cb44 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -702,6 +702,8 @@ private: static String8 toString(std::set<userid_t> intSet); + static void pingCameraServiceProxy(); + }; template<class Func> |