commit cfab4e162c66843f1d0b2b45ef2281201df78d06
author Yin-Chia Yeh <yinchiayeh@google.com> Mon Sep 09 13:08:28 2019 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Mon Sep 09 13:08:28 2019 -0700
tree 2acaf2be7a2ec5c1b236540842213f0da2843f13
parent 5f5ee1ccd75a23df68fd506142348f1476e1e5b6

Camera: update camera audio restriction API

Add dedicated get API for API review feedback.

Test: updated CTS pass
Bug: 140524714
Change-Id: I0559e24d6d9f4a2d9db6c0b6035eaf49bd41d950

services/camera/libcameraservice/api1/CameraClient.cpp

diff --git a/services/camera/libcameraservice/api1/CameraClient.cpp b/services/camera/libcameraservice/api1/CameraClient.cpp
index 089f6cf..764b3a9 100644
--- a/services/camera/libcameraservice/api1/CameraClient.cpp
+++ b/services/camera/libcameraservice/api1/CameraClient.cpp
@@ -1171,7 +1171,7 @@
     return INVALID_OPERATION;
 }
 
-int32_t CameraClient::setAudioRestriction(int mode) {
+status_t CameraClient::setAudioRestriction(int mode) {
     if (!isValidAudioRestriction(mode)) {
         ALOGE("%s: invalid audio restriction mode %d", __FUNCTION__, mode);
         return BAD_VALUE;
@@ -1184,5 +1184,12 @@
     return BasicClient::setAudioRestriction(mode);
 }
 
+int32_t CameraClient::getGlobalAudioRestriction() {
+    Mutex::Autolock lock(mLock);
+    if (checkPidAndHardware() != NO_ERROR) {
+        return INVALID_OPERATION;
+    }
+    return BasicClient::getServiceAudioRestriction();
+}
 
 }; // namespace android