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

Commit d066d5b7 authored by Baohe.Wang's avatar Baohe.Wang Committed by android-build-merger
Browse files

Merge "TvInputManagerService patch" am: 11e60c08 am: 2891b74a 

am: d710ca39

Change-Id: Ie113645bb83463d3dd0c12d71cf4a6a3ed8da42a
parents cfbb2382 d710ca39

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -842,6 +842,10 @@ public final class TvInputManagerService extends SystemService { 
    private void setStateLocked(String inputId, int state, int userId) {

    private void setStateLocked(String inputId, int state, int userId) {

        UserState userState = getOrCreateUserStateLocked(userId);

        UserState userState = getOrCreateUserStateLocked(userId);

        TvInputState inputState = userState.inputMap.get(inputId);

        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());

        ServiceState serviceState = userState.serviceStateMap.get(inputState.info.getComponent());

        int oldState = inputState.state;

        int oldState = inputState.state;

        inputState.state = state;

        inputState.state = state;