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

Merge "Make sure to finish routing control action" into lmp-dev

Browse Source
This commit is contained in:
Jinsuk Kim
2014-07-14 01:31:07 +00:00
committed by Android (Google) Code Review
parent eba1c0bb70 dd233f3d25
commit bc2b9d30cd
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);
}
}