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

camera/ICamera.cpp

diff --git a/camera/ICamera.cpp b/camera/ICamera.cpp
index 060e8e0..b83edf7 100644
--- a/camera/ICamera.cpp
+++ b/camera/ICamera.cpp
@@ -57,6 +57,7 @@
     RELEASE_RECORDING_FRAME_HANDLE,
     RELEASE_RECORDING_FRAME_HANDLE_BATCH,
     SET_AUDIO_RESTRICTION,
+    GET_GLOBAL_AUDIO_RESTRICTION,
 };
 
 class BpCamera: public BpInterface<ICamera>
@@ -192,7 +193,7 @@
         }
     }
 
-    int32_t setAudioRestriction(int32_t mode) {
+    status_t setAudioRestriction(int32_t mode) {
         Parcel data, reply;
         data.writeInterfaceToken(ICamera::getInterfaceDescriptor());
         data.writeInt32(mode);
@@ -200,6 +201,13 @@
         return reply.readInt32();
     }
 
+    int32_t getGlobalAudioRestriction() {
+        Parcel data, reply;
+        data.writeInterfaceToken(ICamera::getInterfaceDescriptor());
+        remote()->transact(GET_GLOBAL_AUDIO_RESTRICTION, data, &reply);
+        return reply.readInt32();
+    }
+
     status_t setVideoBufferMode(int32_t videoBufferMode)
     {
         ALOGV("setVideoBufferMode: %d", videoBufferMode);
@@ -509,6 +517,11 @@
             reply->writeInt32(setAudioRestriction(mode));
             return NO_ERROR;
         } break;
+        case GET_GLOBAL_AUDIO_RESTRICTION: {
+            CHECK_INTERFACE(ICamera, data, reply);
+            reply->writeInt32(getGlobalAudioRestriction());
+            return NO_ERROR;
+        } break;
         default:
             return BBinder::onTransact(code, data, reply, flags);
     }