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

2015-01-21 02:10:53 +00:00
parent 66f8d9bb69 337ce19bef
commit f23829d64f
1 changed files with 1 additions and 2 deletions
--- a/services/core/java/com/android/server/hdmi/RoutingControlAction.java
+++ b/services/core/java/com/android/server/hdmi/RoutingControlAction.java
@@ -119,10 +119,9 @@ final class RoutingControlAction extends HdmiCecFeatureAction {

    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);