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

Commit 2de3a42f authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "HDMI: Temporary qcom HDMI fixes" into ics

parents 550851d6 f8bb07c6

cmds/hdmid/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ endif 


LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES -DQCOM_HDMI_OUT



ifeq ($(TARGET_QCOM_HDMI_RESOLUTION_AUTO),true)

	LOCAL_CFLAGS += -DFORCE_AUTO_RESOLUTION

endif



LOCAL_SHARED_LIBRARIES := \

	libcutils \

	libutils \

cmds/hdmid/HDMIDaemon.cpp

+3 −0
Original line number Diff line number Diff line
@@ -514,6 +514,9 @@ void HDMIDaemon::setResolution(int ID) 
    struct fb_var_screeninfo info;

    if (!openFramebuffer())

        return;

#ifdef FORCE_AUTO_RESOLUTION

    ID = 0;

#endif

    //If its a valid mode and its a new ID - update var_screeninfo

    if ((isValidMode(ID)) && mCurrentID != ID) {

        const struct disp_mode_timing_type *mode = &supported_video_mode_lut[0];

services/java/com/android/server/HDMIService.java

+2 −0
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ class HDMIService extends IHDMIService.Stub { 
                  "HDMI_USEROPTION");

        if (hdmiUserOption != null && hdmiUserOption.equals("HDMI_ON"))

            mHDMIUserOption = true;

        else

            setHDMIOutput(true);

    }



    BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {