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

Commit 549a3edd authored by Nathalie Le Clair's avatar Nathalie Le Clair
Browse files

Remove playback device handling from source device routing control 

Redundant since handleRoutingChange and handleRoutingInformation are
overridden in HdmiCecLocalDevicePlayback.

Bug: 153950818
Test: atest HdmiCecLocalDevicePlaybackTest
Change-Id: Id09ab99c082546027e8d15f06ea42b2488b768b1
parent 78dfa03b

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

+0 −12
Original line number Original line Diff line number Diff line
@@ -190,12 +190,6 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 
            mService.maySendFeatureAbortCommand(message, Constants.ABORT_REFUSED);

            mService.maySendFeatureAbortCommand(message, Constants.ABORT_REFUSED);

            return true;

            return true;

        }

        }

        // if the current device is a pure playback device

        if (!mIsSwitchDevice

                && physicalAddress == mService.getPhysicalAddress()

                && mService.isPlaybackDevice()) {

            setAndBroadcastActiveSource(message, physicalAddress);

        }

        handleRoutingChangeAndInformation(physicalAddress, message);

        handleRoutingChangeAndInformation(physicalAddress, message);

        return true;

        return true;

    }

    }
@@ -214,12 +208,6 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 
            mService.maySendFeatureAbortCommand(message, Constants.ABORT_REFUSED);

            mService.maySendFeatureAbortCommand(message, Constants.ABORT_REFUSED);

            return true;

            return true;

        }

        }

        // if the current device is a pure playback device

        if (!mIsSwitchDevice

                && physicalAddress == mService.getPhysicalAddress()

                && mService.isPlaybackDevice()) {

            setAndBroadcastActiveSource(message, physicalAddress);

        }

        handleRoutingChangeAndInformation(physicalAddress, message);

        handleRoutingChangeAndInformation(physicalAddress, message);

        return true;

        return true;

    }

    }