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

Commit 9bb6fbb7 authored by Jungshik Jang's avatar Jungshik Jang Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: Fix a couple of bugs in CEC services" into lmp-preview-dev

parents 1dcef4f9 a8fd44b7

core/java/android/hardware/hdmi/HdmiCecMessage.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public final class HdmiCecMessage implements Parcelable { 
    public HdmiCecMessage(int source, int destination, int opcode, byte[] params) {

        mSource = source;

        mDestination = destination;

        mOpcode = opcode;

        mOpcode = opcode & 0xFF;

        mParams = Arrays.copyOf(params, params.length);

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -133,7 +133,8 @@ abstract class FeatureAction { 


        @Override

        public void sendTimerMessage(int state, long delayMillis) {

            sendMessageDelayed(obtainMessage(MSG_TIMEOUT, state), delayMillis);

            // The third argument(0) is not used.

            sendMessageDelayed(obtainMessage(MSG_TIMEOUT, state, 0), delayMillis);

        }



        @Override