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

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

Merge "TvInputManagerService patch" 

am: 11e60c08

Change-Id: I32d0deab39df9a1ec2a2aaa012fccca307053db2
parents 9a97acb8 11e60c08

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;