am 0878e8c9: am 62ba538b: resolved conflicts for merge of 3170c035 to lmp-mr1-dev

* commit '0878e8c9d1b71f350a8513d373e6f8e74129624a': CEC: Prevents HdmiControlService from turning on TV on wakeup
2014-10-10 23:04:43 +00:00
parent 5457d5ccb6 0878e8c9d1
commit b25c225c28
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
@@ -46,11 +46,6 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice {
                mAddress, mService.getPhysicalAddress(), mDeviceType));
        mService.sendCecCommand(HdmiCecMessageBuilder.buildDeviceVendorIdCommand(
                mAddress, mService.getVendorId()));
-        if (reason == HdmiControlService.INITIATED_BY_SCREEN_ON) {
-            oneTouchPlay(new IHdmiControlCallback.Stub() {
-                @Override public void onComplete(int result) throws RemoteException {}
-            });
-        }
    }

    @Override