From 1481a4282818939436f590d8c88aea2d19166b8e Mon Sep 17 00:00:00 2001 From: Jinsuk Kim Date: Wed, 17 Dec 2014 16:15:05 +0900 Subject: CEC: Pass port ID for set_audio_return_channel This CL passes a port ID when enabling/disabling ARC in case there are multiple HDMI ports that support the feature. Bug: 18781204 Change-Id: I632518132bf07c8ae6f0ff5135429ca719b596b2 --- .../core/java/com/android/server/hdmi/HdmiCecController.java | 7 ++++--- .../java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java | 2 +- .../java/com/android/server/hdmi/HdmiControlService.java | 4 ++-- .../core/jni/com_android_server_hdmi_HdmiCecController.cpp | 12 ++++++------ 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/services/core/java/com/android/server/hdmi/HdmiCecController.java b/services/core/java/com/android/server/hdmi/HdmiCecController.java index 1486feea0e63..55917fc5a945 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecController.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecController.java @@ -331,12 +331,13 @@ final class HdmiCecController { /** * Configure ARC circuit in the hardware logic to start or stop the feature. * + * @param port ID of HDMI port to which AVR is connected * @param enabled whether to enable/disable ARC */ @ServiceThreadOnly - void setAudioReturnChannel(boolean enabled) { + void setAudioReturnChannel(int port, boolean enabled) { assertRunOnServiceThread(); - nativeSetAudioReturnChannel(mNativePtr, enabled); + nativeSetAudioReturnChannel(mNativePtr, port, enabled); } /** @@ -633,6 +634,6 @@ final class HdmiCecController { private static native int nativeGetVendorId(long controllerPtr); private static native HdmiPortInfo[] nativeGetPortInfos(long controllerPtr); private static native void nativeSetOption(long controllerPtr, int flag, int value); - private static native void nativeSetAudioReturnChannel(long controllerPtr, boolean flag); + private static native void nativeSetAudioReturnChannel(long controllerPtr, int port, boolean flag); private static native boolean nativeIsConnected(long controllerPtr, int port); } diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java index 62de5343fca6..e6990c678fe4 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java @@ -827,7 +827,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { HdmiLogger.debug("Set Arc Status[old:%b new:%b]", mArcEstablished, enabled); boolean oldStatus = mArcEstablished; // 1. Enable/disable ARC circuit. - mService.setAudioReturnChannel(enabled); + mService.setAudioReturnChannel(getAvrDeviceInfo().getPortId(), enabled); // 2. Notify arc status to audio service. notifyArcStatusToAudioService(enabled); // 3. Update arc status; diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index 0322ae601f65..8ce6caf30c84 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -756,8 +756,8 @@ public final class HdmiControlService extends SystemService { return dispatchMessageToLocalDevice(message); } - void setAudioReturnChannel(boolean enabled) { - mCecController.setAudioReturnChannel(enabled); + void setAudioReturnChannel(int portId, boolean enabled) { + mCecController.setAudioReturnChannel(portId, enabled); } @ServiceThreadOnly diff --git a/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp b/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp index 5c557b6e7c9a..a35af9113aec 100644 --- a/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp +++ b/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp @@ -62,7 +62,7 @@ public: // Set a flag and its value. void setOption(int flag, int value); // Set audio return channel status. - void setAudioReturnChannel(bool flag); + void setAudioReturnChannel(int port, bool flag); // Whether to hdmi device is connected to the given port. bool isConnected(int port); @@ -260,8 +260,8 @@ void HdmiCecController::setOption(int flag, int value) { } // Set audio return channel status. -void HdmiCecController::setAudioReturnChannel(bool enabled) { - mDevice->set_audio_return_channel(mDevice, enabled ? 1 : 0); + void HdmiCecController::setAudioReturnChannel(int port, bool enabled) { + mDevice->set_audio_return_channel(mDevice, port, enabled ? 1 : 0); } // Whether to hdmi device is connected to the given port. @@ -374,9 +374,9 @@ static void nativeSetOption(JNIEnv* env, jclass clazz, jlong controllerPtr, jint } static void nativeSetAudioReturnChannel(JNIEnv* env, jclass clazz, jlong controllerPtr, - jboolean enabled) { + jint port, jboolean enabled) { HdmiCecController* controller = reinterpret_cast(controllerPtr); - controller->setAudioReturnChannel(enabled == JNI_TRUE); + controller->setAudioReturnChannel(port, enabled == JNI_TRUE); } static jboolean nativeIsConnected(JNIEnv* env, jclass clazz, jlong controllerPtr, jint port) { @@ -399,7 +399,7 @@ static JNINativeMethod sMethods[] = { "(J)[Landroid/hardware/hdmi/HdmiPortInfo;", (void *) nativeGetPortInfos }, { "nativeSetOption", "(JII)V", (void *) nativeSetOption }, - { "nativeSetAudioReturnChannel", "(JZ)V", (void *) nativeSetAudioReturnChannel }, + { "nativeSetAudioReturnChannel", "(JIZ)V", (void *) nativeSetAudioReturnChannel }, { "nativeIsConnected", "(JI)Z", (void *) nativeIsConnected }, }; -- cgit v1.2.3-59-g8ed1b