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/api1/CameraClient.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/api1/CameraClient.h')
| -rw-r--r-- | services/camera/libcameraservice/api1/CameraClient.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/api1/CameraClient.h b/services/camera/libcameraservice/api1/CameraClient.h index 4b89564..6779f5e 100644 --- a/services/camera/libcameraservice/api1/CameraClient.h +++ b/services/camera/libcameraservice/api1/CameraClient.h @@ -64,7 +64,8 @@ public: int cameraFacing, int clientPid, int clientUid, - int servicePid); + int servicePid, + bool legacyMode = false); ~CameraClient(); status_t initialize(camera_module_t *module); @@ -129,6 +130,7 @@ private: int mPreviewCallbackFlag; int mOrientation; // Current display orientation bool mPlayShutterSound; + bool mLegacyMode; // camera2 api legacy mode? // Ensures atomicity among the public methods mutable Mutex mLock; |