am e9a205ce: am 017bb852: DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager.

* commit 'e9a205cec4001faab38a1fdba88b29125bfe37d1':
  DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager.
This commit is contained in:
Dongwon Kang
2015-01-05 02:42:06 +00:00
committed by Android Git Automerger

View File

@@ -216,10 +216,13 @@ class TvInputHardwareManager implements TvInputHal.Callback {
mHandler.obtainMessage(ListenerHandler.STATE_CHANGED,
convertConnectedToState(configs.length > 0), 0, inputId).sendToTarget();
}
try {
connection.getCallbackLocked().onStreamConfigChanged(configs);
} catch (RemoteException e) {
Slog.e(TAG, "error in onStreamConfigurationChanged", e);
ITvInputHardwareCallback callback = connection.getCallbackLocked();
if (callback != null) {
try {
callback.onStreamConfigChanged(configs);
} catch (RemoteException e) {
Slog.e(TAG, "error in onStreamConfigurationChanged", e);
}
}
}
}