Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TIF: Handle null main session

Browse Source 
Change-Id: I5d9007e706d2adf4b559839c1db31221527214ec
This commit is contained in:
Ji-Hwan Lee
2014-07-24 17:34:19 +09:00
parent 982abe693f
commit abca0ee794
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/core/java/com/android/server/tv/TvInputManagerService.java
View File

@@ -657,8 +657,12 @@ public final class TvInputManagerService extends SystemService {
}
private void removeSessionStateLocked(IBinder sessionToken, int userId) {
// Remove the session state from the global session state map of the current user.
UserState userState = getUserStateLocked(userId);
if (sessionToken == userState.mainSessionToken) {
userState.mainSessionToken = null;
}
// Remove the session state from the global session state map of the current user.
SessionState sessionState = userState.sessionStateMap.remove(sessionToken);
// Close the open log entry, if any.
@@ -936,18 +940,22 @@ public final class TvInputManagerService extends SystemService {
return;
}
SessionState prevMainSessionState = getSessionStateLocked(
userState.mainSessionToken, Process.SYSTEM_UID, resolvedUserId);
ServiceState prevMainServiceState = getServiceStateLocked(
prevMainSessionState.mInfo.getComponent(), resolvedUserId);
ITvInputSession prevMainSession = getSessionLocked(prevMainSessionState);
SessionState sessionState = getSessionStateLocked(sessionToken, callingUid,
resolvedUserId);
ServiceState serviceState = getServiceStateLocked(
sessionState.mInfo.getComponent(), resolvedUserId);
ITvInputSession session = getSessionLocked(sessionState);
ServiceState prevMainServiceState = null;
ITvInputSession prevMainSession = null;
if (userState.mainSessionToken != null) {
SessionState prevMainSessionState = getSessionStateLocked(
userState.mainSessionToken, Process.SYSTEM_UID, resolvedUserId);
prevMainServiceState = getServiceStateLocked(
prevMainSessionState.mInfo.getComponent(), resolvedUserId);
prevMainSession = getSessionLocked(prevMainSessionState);
}
userState.mainSessionToken = sessionToken;
// Inform the new main session first. See {@link TvInputService#onSetMain}.
@@ -958,7 +966,7 @@ public final class TvInputManagerService extends SystemService {
Slog.e(TAG, "error in setMainSession", e);
}
}
if (prevMainServiceState.mIsHardware) {
if (prevMainSession != null && prevMainServiceState.mIsHardware) {
try {
prevMainSession.setMainSession(false);
} catch (RemoteException e) {