Merge "Clean up MHL local devices when HdmiControlService turns into disabled state" into lmp-dev (5ba69067) · Commits · e / os / android_frameworks_base

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

+12 −6

Original line number	Diff line number	Diff line
		@@ -356,7 +356,7 @@ public final class HdmiControlService extends SystemService {
		break;
		case Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED:
		tv().setAutoWakeup(enabled);
		setOption(OPTION_CEC_AUTO_WAKEUP, toInt(enabled));
		setCecOption(OPTION_CEC_AUTO_WAKEUP, toInt(enabled));
		break;
		case Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED:
		tv().setAutoDeviceOff(enabled);
		@@ -1687,6 +1687,7 @@ public final class HdmiControlService extends SystemService {
		}

		private void disableDevices(PendingActionClearedCallback callback) {
		if (mCecController != null) {
		for (HdmiCecLocalDevice device : mCecController.getLocalDeviceList()) {
		device.disableDevice(mStandbyMessageReceived, callback);
		}
		@@ -1695,6 +1696,11 @@ public final class HdmiControlService extends SystemService {
		}
		}

		if (mMhlController != null) {
		mMhlController.clearAllLocalDevices();
		}
		}

		@ServiceThreadOnly
		private void clearLocalDevices() {
		assertRunOnServiceThread();
		@@ -1763,7 +1769,7 @@ public final class HdmiControlService extends SystemService {
		}

		@ServiceThreadOnly
		void setOption(int key, int value) {
		void setCecOption(int key, int value) {
		assertRunOnServiceThread();
		mCecController.setOption(key, value);
		}