drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Obtain TV power status correctly in HdmiControlService

Browse Source 
Bug: 15845654

Change-Id: I28b97e7ecb462b4fbaf6ac573e4d0fc9fcf724da
This commit is contained in:
Jinsuk Kim
2014-07-04 13:26:44 +09:00
parent 5344cd98e6
commit cae6627702
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
View File

@ -215,6 +215,10 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
addAndStartAction(new RoutingControlAction(this, newPath, false, callback));
}
int getPowerStatus() {
return mService.getPowerStatus();
}
/**
* Sends key to a target CEC device.
*

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

@ -108,9 +108,8 @@ final class RoutingControlAction extends FeatureAction {
}
private void handleReportPowerStatus(int devicePowerStatus) {
int tvPowerStatus = getTvPowerStatus();
if (isPowerStatusOnOrTransientToOn(tvPowerStatus)) {
if (isPowerStatusOnOrTransientToOn(devicePowerStatus)) {
if (isPowerOnOrTransient(getTvPowerStatus())) {
if (isPowerOnOrTransient(devicePowerStatus)) {
sendSetStreamPath();
} else {
tv().updateActivePortId(tv().pathToPortId(mCurrentRoutingPath));
@ -121,11 +120,10 @@ final class RoutingControlAction extends FeatureAction {
}
private int getTvPowerStatus() {
// TODO: Obtain TV power status.
return HdmiCec.POWER_STATUS_ON;
return tv().getPowerStatus();
}
private static boolean isPowerStatusOnOrTransientToOn(int status) {
private static boolean isPowerOnOrTransient(int status) {
return status == HdmiCec.POWER_STATUS_ON || status == HdmiCec.POWER_STATUS_TRANSIENT_TO_ON;
}
@ -156,8 +154,7 @@ final class RoutingControlAction extends FeatureAction {
}
return;
case STATE_WAIT_FOR_REPORT_POWER_STATUS:
int tvPowerStatus = getTvPowerStatus();
if (isPowerStatusOnOrTransientToOn(tvPowerStatus)) {
if (isPowerOnOrTransient(getTvPowerStatus())) {
tv().updateActivePortId(tv().pathToPortId(mCurrentRoutingPath));
sendSetStreamPath();
}