commit 09015492e52299bdf810f95e6aa9262e69879827
author Ji-Hwan Lee <jihwan@google.com> Wed Aug 13 06:43:11 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 12 23:14:48 2014 +0000
tree 5e76faa5c07a32438a66e0fcad2bbdc1769f3f17
parent 3eb780bc17d6f655e389c44a83c4659c454dd24d
parent 0c38fc764b0e1c5c8b880872d9b4a647a76955cd

Merge "TIF: Fix release logic for hardware wrapper input" into lmp-dev

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

diff --git a/services/core/java/com/android/server/tv/TvInputManagerService.java b/services/core/java/com/android/server/tv/TvInputManagerService.java
index 3378171..0b39598 100644
--- a/services/core/java/com/android/server/tv/TvInputManagerService.java
+++ b/services/core/java/com/android/server/tv/TvInputManagerService.java
@@ -1809,7 +1809,7 @@
                 // If there are any other sessions based on this session, they should be released.
                 UserState userState = getUserStateLocked(mUserId);
                 for (SessionState sessionState : userState.sessionStateMap.values()) {
-                    if (mSession != null && mSession == sessionState.mHardwareSessionToken) {
+                    if (mSessionToken == sessionState.mHardwareSessionToken) {
                         try {
                             sessionState.mSession.release();
                         } catch (RemoteException e) {