Merge "TIF: change input state based on the number of available streams" into lmp-mr1-dev (470b77b8) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/tv/TvInputHardwareManager.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -188,6 +188,11 @@ class TvInputHardwareManager implements TvInputHal.Callback {
		return;
		}
		connection.updateConfigsLocked(configs);
		String inputId = mHardwareInputIdMap.get(deviceId);
		if (inputId != null) {
		mHandler.obtainMessage(ListenerHandler.STATE_CHANGED,
		convertConnectedToState(config.length > 0), 0, inputId).sendToTarget();
		}
		try {
		connection.getCallbackLocked().onStreamConfigChanged(configs);
		} catch (RemoteException e) {
		@@ -257,6 +262,9 @@ class TvInputHardwareManager implements TvInputHal.Callback {
		mHardwareInputIdMap.put(deviceId, info.getId());
		mInputMap.put(info.getId(), info);

		// Process pending state changes

		// For logical HDMI devices, they have information from HDMI CEC signals.
		for (int i = 0; i < mHdmiStateMap.size(); ++i) {
		TvInputHardwareInfo hardwareInfo =
		findHardwareInfoForHdmiPortLocked(mHdmiStateMap.keyAt(i));
		@@ -268,8 +276,17 @@ class TvInputHardwareManager implements TvInputHal.Callback {
		mHandler.obtainMessage(ListenerHandler.STATE_CHANGED,
		convertConnectedToState(mHdmiStateMap.valueAt(i)), 0,
		inputId).sendToTarget();
		return;
		}
		}
		// For the rest of the devices, we can tell by the number of available streams.
		Connection connection = mConnections.get(deviceId);
		if (connection != null) {
		mHandler.obtainMessage(ListenerHandler.STATE_CHANGED,
		convertConnectedToState(connection.getConfigsLocked().length > 0), 0,
		info.getId()).sendToTarget();
		return;
		}
		}
		}