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

Commit 9a59d9c9 authored by Amy's avatar Amy Committed by Shubang Lu
Browse files

Rename setActiveSource(Boolean) to be different from setActiveSource(ActiveSource). 

ag/4918867

Test: local test.
Change-Id: I63c52c8eabbbdaa8599efe859cb48d6b6100cff7
parent d76888aa

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -174,7 +174,7 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
    }

    }





    @ServiceThreadOnly

    @ServiceThreadOnly

    void setActiveSource(boolean on) {

    void setIsActiveSource(boolean on) {

        assertRunOnServiceThread();

        assertRunOnServiceThread();

        mIsActiveSource = on;

        mIsActiveSource = on;

        if (on) {

        if (on) {
@@ -228,7 +228,7 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
        // If the path is under the current device, should switch

        // If the path is under the current device, should switch

        int port = getLocalPortFromPhysicalAddress(physicalAddress);

        int port = getLocalPortFromPhysicalAddress(physicalAddress);

        if (port == 0) {

        if (port == 0) {

            setActiveSource(true);

            setIsActiveSource(true);

            maySendActiveSource(message.getSource());

            maySendActiveSource(message.getSource());

            wakeUpIfActiveSource();

            wakeUpIfActiveSource();

        } else if (port > 0) {

        } else if (port > 0) {
@@ -263,7 +263,7 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
    }

    }





    private void maySetActiveSource(int physicalAddress) {

    private void maySetActiveSource(int physicalAddress) {

        setActiveSource(physicalAddress == mService.getPhysicalAddress());

        setIsActiveSource(physicalAddress == mService.getPhysicalAddress());

    }

    }





    private void wakeUpIfActiveSource() {

    private void wakeUpIfActiveSource() {
@@ -352,7 +352,7 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
            mService.sendCecCommand(HdmiCecMessageBuilder.buildInactiveSource(

            mService.sendCecCommand(HdmiCecMessageBuilder.buildInactiveSource(

                    mAddress, mService.getPhysicalAddress()));

                    mAddress, mService.getPhysicalAddress()));

        }

        }

        setActiveSource(false);

        setIsActiveSource(false);

        checkIfPendingActionsCleared();

        checkIfPendingActionsCleared();

    }

    }

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 




    private static final String TAG = "HdmiCecLocalDeviceSource";

    private static final String TAG = "HdmiCecLocalDeviceSource";





    // Indicate if current device is Active Source or not

    private boolean mIsActiveSource = false;

    private boolean mIsActiveSource = false;





    protected HdmiCecLocalDeviceSource(HdmiControlService service, int deviceType) {

    protected HdmiCecLocalDeviceSource(HdmiControlService service, int deviceType) {
@@ -87,7 +88,7 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 
        if (!mActiveSource.equals(activeSource)) {

        if (!mActiveSource.equals(activeSource)) {

            setActiveSource(activeSource);

            setActiveSource(activeSource);

        }

        }

        setActiveSource(physicalAddress == mService.getPhysicalAddress());

        setIsActiveSource(physicalAddress == mService.getPhysicalAddress());

        return true;

        return true;

    }

    }
@@ -103,7 +104,7 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 
    }

    }





    @ServiceThreadOnly

    @ServiceThreadOnly

    void setActiveSource(boolean on) {

    void setIsActiveSource(boolean on) {

        assertRunOnServiceThread();

        assertRunOnServiceThread();

        mIsActiveSource = on;

        mIsActiveSource = on;

    }

    }

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -85,7 +85,7 @@ final class OneTouchPlayAction extends HdmiCecFeatureAction { 
    private void broadcastActiveSource() {

    private void broadcastActiveSource() {

        sendCommand(HdmiCecMessageBuilder.buildActiveSource(getSourceAddress(), getSourcePath()));

        sendCommand(HdmiCecMessageBuilder.buildActiveSource(getSourceAddress(), getSourcePath()));

        // Because only source device can create this action, it's safe to cast.

        // Because only source device can create this action, it's safe to cast.

        source().setActiveSource(true);

        source().setIsActiveSource(true);

    }

    }





    private void queryDevicePowerStatus() {

    private void queryDevicePowerStatus() {