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

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

View File

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