diff --git a/services/core/java/com/android/server/tv/TvInputHardwareManager.java b/services/core/java/com/android/server/tv/TvInputHardwareManager.java index 430a8ff691ba2..daa7e1d5dd09a 100644 --- a/services/core/java/com/android/server/tv/TvInputHardwareManager.java +++ b/services/core/java/com/android/server/tv/TvInputHardwareManager.java @@ -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); + } } } }