commit 017bb8523dd7c3dbfd00c055fde241de4dca9da2
author Dongwon Kang <dwkang@google.com> Fri Dec 26 14:53:14 2014 +0900
committer Dongwon Kang <dwkang@google.com> Mon Jan 05 02:12:44 2015 +0000
tree f5dc63a4809fc5399557402e85dd6eb4e1f6c0d8
parent ad1e3d7df42376cd2a257b6c3b2fed540658a6e3

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

Bug: 18688119
Change-Id: I17fd89bfbb34666ad5e14bb6e946aa5347975d4c
(cherry picked from commit b61077357eb6d8b95b303ef107b15db243a9621b)

services/core/java/com/android/server/tv/TvInputHardwareManager.java

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