CEC: Check validity of tvinput id

Bug: 25006096 Change-Id: I1eec8c5ec863b85d66d9c9722101af7f7d3d2f40
2015-11-05 15:53:33 +09:00
parent 2273e0f095
commit a22d77e247
1 changed files with 1 additions and 0 deletions
--- 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());