TIF: Remove session state when hardware wrapper input crashes

Change-Id: I2306cc407a19892c1895ee70bd6bd52b1a3bd4f3

1 files changed, 2 insertions, 5 deletions

diff --git a/services/core/java/com/android/server/tv/TvInputManagerService.java b/services/core/java/com/android/server/tv/TvInputManagerService.java
index aa8c391567eb..4717157fa491 100644
--- a/services/core/java/com/android/server/tv/TvInputManagerService.java
+++ b/services/core/java/com/android/server/tv/TvInputManagerService.java
@@ -1800,11 +1800,8 @@ public final class TvInputManagerService extends SystemService {
                 UserState userState = getUserStateLocked(mUserId);
                 for (SessionState sessionState : userState.sessionStateMap.values()) {
                     if (mSessionToken == sessionState.mHardwareSessionToken) {
-                        try {
-                            sessionState.mSession.release();
-                        } catch (RemoteException e) {
-                            Slog.e(TAG, "error in release", e);
-                        }
+                        releaseSessionLocked(sessionState.mSessionToken, Process.SYSTEM_UID,
+                                mUserId);
                         try {
                             sessionState.mClient.onSessionReleased(sessionState.mSeq);
                         } catch (RemoteException e) {