From a22d77e24737b785a33987647758cd3c1db85527 Mon Sep 17 00:00:00 2001
From: Terry Heo <terryheo@google.com>
Date: Thu, 5 Nov 2015 15:53:33 +0900
Subject: [PATCH] CEC: Check validity of tvinput id

Bug: 25006096
Change-Id: I1eec8c5ec863b85d66d9c9722101af7f7d3d2f40
---
 .../core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index 37afd08506bab..cb56b35e09587 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -138,6 +138,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
         @Override
         public void onInputAdded(String inputId) {
             TvInputInfo tvInfo = mService.getTvInputManager().getTvInputInfo(inputId);
+            if (tvInfo == null) return;
             HdmiDeviceInfo info = tvInfo.getHdmiDeviceInfo();
             if (info == null) return;
             addTvInput(inputId, info.getId());