From 549a3edd8e7492240314b4647f753275243cc9a5 Mon Sep 17 00:00:00 2001 From: Nathalie Le Clair Date: Mon, 28 Sep 2020 12:30:56 +0200 Subject: [PATCH] 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 --- .../server/hdmi/HdmiCecLocalDeviceSource.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java index a148d82373dde..329db98dfbf5b 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java @@ -190,12 +190,6 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { mService.maySendFeatureAbortCommand(message, Constants.ABORT_REFUSED); return true; } - // if the current device is a pure playback device - if (!mIsSwitchDevice - && physicalAddress == mService.getPhysicalAddress() - && mService.isPlaybackDevice()) { - setAndBroadcastActiveSource(message, physicalAddress); - } handleRoutingChangeAndInformation(physicalAddress, message); return true; } @@ -214,12 +208,6 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { mService.maySendFeatureAbortCommand(message, Constants.ABORT_REFUSED); return true; } - // if the current device is a pure playback device - if (!mIsSwitchDevice - && physicalAddress == mService.getPhysicalAddress() - && mService.isPlaybackDevice()) { - setAndBroadcastActiveSource(message, physicalAddress); - } handleRoutingChangeAndInformation(physicalAddress, message); return true; }