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

Make sure to finish routing control action

Browse Source 
After HdmiControlService performs routing control action,
make sure it is finished all the time.

Change-Id: I38e130ee5d8712a18aac7a46cad0950a23713469
(cherry picked from commit 7d05469196721aaa888447149d3b93c8689ff72e)
This commit is contained in:
Jinsuk Kim
2014-07-14 07:39:32 +09:00
parent 1e6eb17a22
commit dd233f3d25
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,9 +114,8 @@ final class RoutingControlAction extends FeatureAction {
tv().updateActivePortId(tv().pathToPortId(mCurrentRoutingPath));
}
}
invokeCallback(HdmiControlManager.RESULT_SUCCESS);
finish();
}
finishWithCallback(HdmiControlManager.RESULT_SUCCESS);
}
private int getTvPowerStatus() {
return tv().getPowerStatus();
@@ -132,6 +131,11 @@ final class RoutingControlAction extends FeatureAction {
mCurrentRoutingPath));
}
private void finishWithCallback(int result) {
invokeCallback(result);
finish();
}
@Override
public void handleTimerEvent(int timeoutState) {
if (mState != timeoutState || mState == STATE_NONE) {
@@ -152,6 +156,7 @@ final class RoutingControlAction extends FeatureAction {
});
} else {
tv().updateActivePortId(tv().pathToPortId(mCurrentRoutingPath));
finishWithCallback(HdmiControlManager.RESULT_SUCCESS);
}
return;
case STATE_WAIT_FOR_REPORT_POWER_STATUS:
@@ -159,8 +164,7 @@ final class RoutingControlAction extends FeatureAction {
tv().updateActivePortId(tv().pathToPortId(mCurrentRoutingPath));
sendSetStreamPath();
}
invokeCallback(HdmiControlManager.RESULT_SUCCESS);
finish();
finishWithCallback(HdmiControlManager.RESULT_SUCCESS);
return;
}
}
@@ -177,6 +181,7 @@ final class RoutingControlAction extends FeatureAction {
} else {
tv().updateActivePortId(tv().pathToPortId(mCurrentRoutingPath));
sendSetStreamPath();
finishWithCallback(HdmiControlManager.RESULT_SUCCESS);
}
}