Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jinsuk Kim
2015-01-21 02:10:53 +00:00
committed by Android (Google) Code Review
parent 66f8d9bb69 337ce19bef
commit f23829d64f
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/hdmi/RoutingControlAction.java
View File

@@ -119,10 +119,9 @@ final class RoutingControlAction extends HdmiCecFeatureAction {
private void handleReportPowerStatus(int devicePowerStatus) { private void handleReportPowerStatus(int devicePowerStatus) {
if (isPowerOnOrTransient(getTvPowerStatus())) { if (isPowerOnOrTransient(getTvPowerStatus())) {
tv().updateActiveInput(mCurrentRoutingPath, mNotifyInputChange);
if (isPowerOnOrTransient(devicePowerStatus)) { if (isPowerOnOrTransient(devicePowerStatus)) {
sendSetStreamPath(); sendSetStreamPath();
} else {
tv().updateActiveInput(mCurrentRoutingPath, mNotifyInputChange);
} }
} }
finishWithCallback(HdmiControlManager.RESULT_SUCCESS); finishWithCallback(HdmiControlManager.RESULT_SUCCESS);