Merge "CEC: Prevents HdmiControlService from turning on TV on wakeup" into lmp-dev

2014-10-10 03:52:24 +00:00
parent 7ea69880bd 229c422c7b
commit 294297df4e
1 changed files with 0 additions and 5 deletions
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
@@ -44,11 +44,6 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice {
        assertRunOnServiceThread();
        mService.sendCecCommand(HdmiCecMessageBuilder.buildReportPhysicalAddressCommand(
                mAddress, mService.getPhysicalAddress(), mDeviceType));
-        if (reason == HdmiControlService.INITIATED_BY_SCREEN_ON) {
-            oneTouchPlay(new IHdmiControlCallback.Stub() {
-                @Override public void onComplete(int result) throws RemoteException {}
-            });
-        }
    }

    @Override