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

* commit 'f23829d64ff6fdae6f8b1d2b0fbe3f2715b313d4':
  CEC: Switch active input after routing control
This commit is contained in:
Jinsuk Kim
2015-01-21 02:16:37 +00:00
committed by Android Git Automerger

View File

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