commit 44bb3a5bd630cfe0a4813586e840d59b9cbc9f64
author Jungshik Jang <jayjang@google.com> Tue Aug 26 17:24:24 2014 +0900
committer Jungshik Jang <jayjang@google.com> Tue Aug 26 17:24:24 2014 +0900
tree 861e86b116ff7788de3e49cd0c5b442a60427f5b
parent ed25dda8ba5b1be9bd050939deca82bf6506a09b

Add null-check for system audio mode change event.

Bug: 17270923
Change-Id: I23fa593893591f6032105ff936b8eee10d8c0cfa

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 fa991c2..77ab33b 100644
--- a/services/core/java/com/android/server/tv/TvInputHardwareManager.java
+++ b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
@@ -1021,7 +1021,9 @@
             synchronized (mLock) {
                 for (int i = 0; i < mConnections.size(); ++i) {
                     TvInputHardwareImpl impl = mConnections.valueAt(i).getHardwareImplLocked();
-                    impl.handleAudioSinkUpdated();
+                    if (impl != null) {
+                        impl.handleAudioSinkUpdated();
+                    }
                 }
             }
         }