diff options
| author | Igor Murashkin <iam@google.com> | 2014-08-19 14:53:08 -0700 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2014-08-19 15:19:58 -0700 |
| commit | a858ea0495c887621a2fd9c0afc13780deccb597 (patch) | |
| tree | dbe17ab6e77cfe3e40ce6c8114898e3ac5aef5b4 /services/camera/libcameraservice/CameraService.h | |
| parent | 97c7fa1b1596a062147f034a2b44781193c052cf (diff) | |
| download | frameworks_av-a858ea0495c887621a2fd9c0afc13780deccb597.zip frameworks_av-a858ea0495c887621a2fd9c0afc13780deccb597.tar.gz frameworks_av-a858ea0495c887621a2fd9c0afc13780deccb597.tar.bz2 | |
camera: Allow shutter sounds to be disabled from camera2 api
When using the connectLegacy binder interface (available only
through an @hide java api), then consider the camera to be in the
camera2 api legacy mode.
In legacy mode, allow disabling the shutter sound unconditionally.
Bug: 17109582
Change-Id: Ieb3fc61ff111d792cc657c018e278349c25472cf
Diffstat (limited to 'services/camera/libcameraservice/CameraService.h')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index cb98c96..a7328cf 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -452,14 +452,17 @@ private: * * Returns OK on success, or a negative error code. */ - status_t connectHelperLocked(const sp<ICameraClient>& cameraClient, - int cameraId, - const String16& clientPackageName, - int clientUid, - int callingPid, - /*out*/ - sp<Client>& client, - int halVersion = CAMERA_HAL_API_VERSION_UNSPECIFIED); + status_t connectHelperLocked( + /*out*/ + sp<Client>& client, + /*in*/ + const sp<ICameraClient>& cameraClient, + int cameraId, + const String16& clientPackageName, + int clientUid, + int callingPid, + int halVersion = CAMERA_HAL_API_VERSION_UNSPECIFIED, + bool legacyMode = false); }; } // namespace android |