diff options
| -rw-r--r-- | services/core/java/com/android/server/hdmi/RoutingControlAction.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/hdmi/RoutingControlAction.java b/services/core/java/com/android/server/hdmi/RoutingControlAction.java index 46dc45311594..8296f695c1fc 100644 --- a/services/core/java/com/android/server/hdmi/RoutingControlAction.java +++ b/services/core/java/com/android/server/hdmi/RoutingControlAction.java @@ -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); } } |