Camera: camera service implementation of camera audio restriction API
Changed the binder call return value to the resulting
audio restriction mode.
Also added audio restriction API support for legacy shim
path.
Test: new CTS tests
Bug: 135676184
Change-Id: I412e8f53705f2401995ff828bfdc9a8598dc305a
diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp
index b499981..f87163b 100644
--- a/core/jni/android_hardware_Camera.cpp
+++ b/core/jni/android_hardware_Camera.cpp
@@ -1023,6 +1023,25 @@
}
}
+static int32_t android_hardware_Camera_setAudioRestriction(
+ JNIEnv *env, jobject thiz, jint mode)
+{
+ ALOGV("setAudioRestriction");
+ sp<Camera> camera = get_native_camera(env, thiz, NULL);
+ if (camera == 0) {
+ jniThrowRuntimeException(env, "camera has been disconnected");
+ return -1;
+ }
+
+ int32_t ret = camera->setAudioRestriction(mode);
+ if (ret < 0) {
+ jniThrowRuntimeException(env, "Illegal argument or low-level eror");
+ return -1;
+ }
+
+ return ret;
+}
+
//-------------------------------------------------
static const JNINativeMethod camMethods[] = {
@@ -1107,6 +1126,9 @@
{ "enableFocusMoveCallback",
"(I)V",
(void *)android_hardware_Camera_enableFocusMoveCallback},
+ { "setAudioRestriction",
+ "(I)I",
+ (void *)android_hardware_Camera_setAudioRestriction},
};
struct field {