summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/tv/TvInputHardwareManager.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/tv/TvInputHardwareManager.java b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
index 77860349291f..60c0193f977f 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);
+ }
}
}
}