Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9e44ea7 authored by Jinsuk Kim's avatar Jinsuk Kim Committed by Android (Google) Code Review
Browse files

Merge "Update HdmiControlService JNI to the change in HAL definition"

parents f84a1b87 284c31b9

services/core/jni/com_android_server_hdmi_HdmiCecController.cpp

+3 −3
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ public: 
            break;

        case HDMI_EVENT_HOT_PLUG:

            mEvent.hotplug.connected = event.hotplug.connected;

            mEvent.hotplug.port = event.hotplug.port;

            mEvent.hotplug.port_id = event.hotplug.port_id;

            break;

        default:

            // TODO: add more type whenever new type is introduced.
@@ -162,7 +162,7 @@ private: 
    void propagateHotplugEvent(const hotplug_event_t& event) {

        // Note that this method should be called in service thread.

        JNIEnv* env = AndroidRuntime::getJNIEnv();

        jint port = event.port;

        jint port = event.port_id;

        jboolean connected = (jboolean) event.connected;

        env->CallVoidMethod(mController->getCallbacksObj(),

                gHdmiCecControllerClassInfo.handleHotplug, port, connected);
@@ -248,7 +248,7 @@ jobjectArray HdmiCecController::getPortInfos() { 
        hdmi_port_info* info = &ports[i];

        jboolean cecSupported = (jboolean) info->cec_supported;

        jboolean arcSupported = (jboolean) info->arc_supported;

        jobject infoObj = env->NewObject(hdmiPortInfo, ctor, info->port_num, info->type,

        jobject infoObj = env->NewObject(hdmiPortInfo, ctor, info->port_id, info->type,

                info->physical_address, cecSupported, mhlSupported, arcSupported);

        env->SetObjectArrayElement(res, i, infoObj);

    }