commit 7af0ff9f38c4582d93ab484090b09a768886e398
author Baohe.Wang <Baohe.Wang@mediatek.com> Sun Jun 30 22:34:16 2019 +0800
committer Jay Patel <pateljay@google.com> Tue Aug 20 20:58:03 2019 +0000
tree ab7d1b9ea1fe3b36b558a19b83ada42542e3a711
parent a367e0e4fa7f1eacbf7dbad93f6b3c00cf469587

TvInputManagerService patch

Fix potential null pointer access at TvInputManagerService.java

Bug: 136411969

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

diff --git a/services/core/java/com/android/server/tv/TvInputManagerService.java b/services/core/java/com/android/server/tv/TvInputManagerService.java
index b2677cb..ef57ca1 100644
--- a/services/core/java/com/android/server/tv/TvInputManagerService.java
+++ b/services/core/java/com/android/server/tv/TvInputManagerService.java
@@ -840,6 +840,10 @@
     private void setStateLocked(String inputId, int state, int userId) {
         UserState userState = getOrCreateUserStateLocked(userId);
         TvInputState inputState = userState.inputMap.get(inputId);
+        if (inputState == null) {
+            Slog.e(TAG, "failed to setStateLocked - unknown input id " + inputId);
+            return;
+        }
         ServiceState serviceState = userState.serviceStateMap.get(inputState.info.getComponent());
         int oldState = inputState.state;
         inputState.state = state;