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

Commit 273c98bc authored by Winni Chang's avatar Winni Chang Committed by Automerger Merge Worker
Browse files

Fix eARC log description am: 3c6dbdc9 am: 6dd298bf am: 402a33dc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23487476



Change-Id: I2a48634943f9c2525a7e66532633b2690040b54c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d6fb7bc8 402a33dc

services/core/java/com/android/server/hdmi/HdmiEarcLocalDeviceTx.java

+14 −2
Original line number Original line Diff line number Diff line
@@ -42,6 +42,12 @@ public class HdmiEarcLocalDeviceTx extends HdmiEarcLocalDevice { 
    // How long to wait for the audio system to report its capabilities after eARC was connected

    // How long to wait for the audio system to report its capabilities after eARC was connected

    static final long REPORT_CAPS_MAX_DELAY_MS = 2_000;

    static final long REPORT_CAPS_MAX_DELAY_MS = 2_000;





    // Array containing the names of the eARC states. The integer value of the eARC state

    // corresponds to the index in the array.

    private static final String earcStatusNames[] = {"HDMI_EARC_STATUS_IDLE",

            "HDMI_EARC_STATUS_EARC_PENDING", "HDMI_EARC_STATUS_ARC_PENDING",

            "HDMI_EARC_STATUS_EARC_CONNECTED"};



    // eARC Capability Data Structure parameters

    // eARC Capability Data Structure parameters

    private static final int EARC_CAPS_PAYLOAD_LENGTH = 0x02;

    private static final int EARC_CAPS_PAYLOAD_LENGTH = 0x02;

    private static final int EARC_CAPS_DATA_START = 0x03;

    private static final int EARC_CAPS_DATA_START = 0x03;
@@ -75,11 +81,17 @@ public class HdmiEarcLocalDeviceTx extends HdmiEarcLocalDevice { 
        mReportCapsRunnable = new ReportCapsRunnable();

        mReportCapsRunnable = new ReportCapsRunnable();

    }

    }





    private String earcStatusToString(int status) {

        return earcStatusNames[status];

    }



    protected void handleEarcStateChange(@Constants.EarcStatus int status) {

    protected void handleEarcStateChange(@Constants.EarcStatus int status) {

        int oldEarcStatus;

        int oldEarcStatus;



        synchronized (mLock) {

        synchronized (mLock) {

            HdmiLogger.debug("eARC state change [old:%b new %b]", mEarcStatus,

            HdmiLogger.debug("eARC state change [old: %s(%d) new: %s(%d)]",

                    status);

                    earcStatusToString(mEarcStatus), mEarcStatus,

                    earcStatusToString(status), status);

            oldEarcStatus = mEarcStatus;

            oldEarcStatus = mEarcStatus;

            mEarcStatus = status;

            mEarcStatus = status;

        }

        }