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

am 03bdbca2: am 470b77b8: Merge "TIF: change input state based on the number of available streams" into lmp-mr1-dev

Browse Source 
* commit '03bdbca2a9582691063585ce5fca11e6a33bdfaf':
  TIF: change input state based on the number of available streams
This commit is contained in:
Wonsik Kim
2014-10-27 02:01:13 +00:00
committed by Android Git Automerger
parent 73c463c8d8 03bdbca2a9
commit bae8d7e64a
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/tv/TvInputHardwareManager.java
View File

@@ -188,6 +188,11 @@ class TvInputHardwareManager implements TvInputHal.Callback {
return; return;
} }
connection.updateConfigsLocked(configs); connection.updateConfigsLocked(configs);
String inputId = mHardwareInputIdMap.get(deviceId);
if (inputId != null) {
mHandler.obtainMessage(ListenerHandler.STATE_CHANGED,
convertConnectedToState(config.length > 0), 0, inputId).sendToTarget();
}
try { try {
connection.getCallbackLocked().onStreamConfigChanged(configs); connection.getCallbackLocked().onStreamConfigChanged(configs);
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -257,6 +262,9 @@ class TvInputHardwareManager implements TvInputHal.Callback {
mHardwareInputIdMap.put(deviceId, info.getId()); mHardwareInputIdMap.put(deviceId, info.getId());
mInputMap.put(info.getId(), info); 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) { for (int i = 0; i < mHdmiStateMap.size(); ++i) {
TvInputHardwareInfo hardwareInfo = TvInputHardwareInfo hardwareInfo =
findHardwareInfoForHdmiPortLocked(mHdmiStateMap.keyAt(i)); findHardwareInfoForHdmiPortLocked(mHdmiStateMap.keyAt(i));
@@ -268,8 +276,17 @@ class TvInputHardwareManager implements TvInputHal.Callback {
mHandler.obtainMessage(ListenerHandler.STATE_CHANGED, mHandler.obtainMessage(ListenerHandler.STATE_CHANGED,
convertConnectedToState(mHdmiStateMap.valueAt(i)), 0, convertConnectedToState(mHdmiStateMap.valueAt(i)), 0,
inputId).sendToTarget(); 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;
}
} }
} }