Merge "Make sure to finish routing control action" into lmp-dev (bc2b9d30) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/hdmi/RoutingControlAction.java

+10 −5

Original line number	Diff line number	Diff line
		@@ -114,8 +114,7 @@ final class RoutingControlAction extends FeatureAction {
		tv().updateActivePortId(tv().pathToPortId(mCurrentRoutingPath));
		}
		}
		invokeCallback(HdmiControlManager.RESULT_SUCCESS);
		finish();
		finishWithCallback(HdmiControlManager.RESULT_SUCCESS);
		}

		private int getTvPowerStatus() {
		@@ -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);
		}
		}