Merge "TIF: Fix crash on setMainSession" into lmp-dev

2014-07-24 08:14:43 +00:00
parent 9d9ef2e791 982abe693f
commit 55c8d8ab94
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/tv/TvInputManagerService.java
+++ b/services/core/java/com/android/server/tv/TvInputManagerService.java
@@ -931,7 +931,7 @@ public final class TvInputManagerService extends SystemService {
            final long identity = Binder.clearCallingIdentity();
            try {
                synchronized (mLock) {
-                    UserState userState = getUserStateLocked(callingUid);
+                    UserState userState = getUserStateLocked(resolvedUserId);
                    if (sessionToken == userState.mainSessionToken) {
                        return;
                    }