Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e994f65d authored by Yixiao Luo's avatar Yixiao Luo
Browse files

Check null TvInputState in setStateLocked() when logging external TV input 

Bug: 307398237
Test: mmm
Change-Id: If83898e2e1c7c21ddd3e0d7bf3519d7270e81b4a
parent c46f6012

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

+5 −1
Original line number Diff line number Diff line
@@ -1166,7 +1166,11 @@ public final class TvInputManagerService extends SystemService { 
                                .EXTERNAL_TV_INPUT_EVENT__EVENT_TYPE__CONNECTION_STATE_CHANGED,

                        mOnScreenInputId, mOnScreenSessionState);

            } else if (mOnScreenInputId != null) {

                TvInputInfo currentInputInfo = userState.inputMap.get(mOnScreenInputId).info;

                TvInputState currentInputState = userState.inputMap.get(mOnScreenInputId);

                TvInputInfo currentInputInfo = null;

                if (currentInputState != null) {

                    currentInputInfo = currentInputState.info;

                }

                if (currentInputInfo != null && currentInputInfo.getHdmiDeviceInfo() != null

                        && inputId.equals(currentInputInfo.getParentId())) {

                    logExternalInputEvent(