Merge "TvInputManagerService patch" am: 11e60c0824 am: 2891b74ac3

am: d710ca399a

Change-Id: Ie113645bb83463d3dd0c12d71cf4a6a3ed8da42a
This commit is contained in:
Baohe.Wang
2019-08-20 17:54:44 -07:00
committed by android-build-merger

View File

@@ -842,6 +842,10 @@ public final class TvInputManagerService extends SystemService {
private void setStateLocked(String inputId, int state, int userId) {
UserState userState = getOrCreateUserStateLocked(userId);
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());
int oldState = inputState.state;
inputState.state = state;