From 017bb8523dd7c3dbfd00c055fde241de4dca9da2 Mon Sep 17 00:00:00 2001 From: Dongwon Kang Date: Fri, 26 Dec 2014 14:53:14 +0900 Subject: [PATCH] DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager. Bug: 18688119 Change-Id: I17fd89bfbb34666ad5e14bb6e946aa5347975d4c (cherry picked from commit b61077357eb6d8b95b303ef107b15db243a9621b) --- .../com/android/server/tv/TvInputHardwareManager.java | 11 +++++++---- 1 file 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 77860349291f1..60c0193f977fe 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); + } } } }