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

Commit 6afefd5b authored by Paul Colta's avatar Paul Colta Committed by Android (Google) Code Review
Browse files

Merge "HDMI: Use HAL physical address in OneTouchPlayAction" into main

parents aabbec67 0df4f34d

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -303,6 +303,10 @@ abstract class HdmiCecFeatureAction { 
        return mSource.getDeviceInfo().getPhysicalAddress();

        return mSource.getDeviceInfo().getPhysicalAddress();

    }

    }





    protected final int getServicePath() {

        return mService.getPhysicalAddress();

    }



    protected final void sendUserControlPressedAndReleased(int targetAddress, int uiCommand) {

    protected final void sendUserControlPressedAndReleased(int targetAddress, int uiCommand) {

        mSource.sendUserControlPressedAndReleased(targetAddress, uiCommand);

        mSource.sendUserControlPressedAndReleased(targetAddress, uiCommand);

    }

    }

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -152,7 +152,8 @@ final class OneTouchPlayAction extends HdmiCecFeatureAction { 
        // If the device wasn´t the active source yet,

        // If the device wasn´t the active source yet,

        // this makes it the active source and wakes it up.

        // this makes it the active source and wakes it up.

        mSource.mService.setAndBroadcastActiveSourceFromOneDeviceType(

        mSource.mService.setAndBroadcastActiveSourceFromOneDeviceType(

                mTargetAddress, getSourcePath(), "OneTouchPlayAction#broadcastActiveSource()");

                mTargetAddress, getServicePath(),

                "OneTouchPlayAction#broadcastActiveSource()");

        // When OneTouchPlay is called, client side should be responsible to send out the intent

        // When OneTouchPlay is called, client side should be responsible to send out the intent

        // of which internal source, for example YouTube, it would like to switch to.

        // of which internal source, for example YouTube, it would like to switch to.

        // Here we only update the active port and the active source records in the local

        // Here we only update the active port and the active source records in the local