commit f23829d64ff6fdae6f8b1d2b0fbe3f2715b313d4
author Jinsuk Kim <jinsukkim@google.com> Wed Jan 21 02:10:53 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 21 02:10:54 2015 +0000
tree 5a4293f3d7b577b1065a0cededa5b96e0fd3f3cf
parent 66f8d9bb693d5e410ac6f6ba3029cf6c7dc2f104
parent 337ce19bef8be8edf6102aa31eb349772b622a8d

Merge "CEC: Switch active input after routing control" into lmp-mr1-dev

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

diff --git a/services/core/java/com/android/server/hdmi/RoutingControlAction.java b/services/core/java/com/android/server/hdmi/RoutingControlAction.java
index 435ab7f..ce5b9ab7 100644
--- a/services/core/java/com/android/server/hdmi/RoutingControlAction.java
+++ b/services/core/java/com/android/server/hdmi/RoutingControlAction.java
@@ -119,10 +119,9 @@
 
     private void handleReportPowerStatus(int devicePowerStatus) {
         if (isPowerOnOrTransient(getTvPowerStatus())) {
+            tv().updateActiveInput(mCurrentRoutingPath, mNotifyInputChange);
             if (isPowerOnOrTransient(devicePowerStatus)) {
                 sendSetStreamPath();
-            } else {
-                tv().updateActiveInput(mCurrentRoutingPath, mNotifyInputChange);
             }
         }
         finishWithCallback(HdmiControlManager.RESULT_SUCCESS);