commit 3170c03543e4be7bb82194a84949d920ffe1b82e
author Jinsuk Kim <jinsukkim@google.com> Fri Oct 10 14:45:33 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 10 14:45:33 2014 +0000
tree a80fe153bf12113484de9193a500bc6dac1c3d2d
parent 18d2d51ee30d8df4d3afa5e7b6bb7e7171a18b63
parent 294297df4e3f327a81d922563c518aee8ee3e51d

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

* commit '294297df4e3f327a81d922563c518aee8ee3e51d':
  CEC: Prevents HdmiControlService from turning on TV on wakeup

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

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
index e8ab673..b0ddf2ac 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
@@ -44,11 +44,6 @@
         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