Merge "TIF: Do not build input list for background user" into nyc-dev

2016-04-20 19:19:33 +00:00
parent 1ff2412cc4 a897e5f5e3
commit 4a6bd4b48f
1 changed files with 4 additions and 2 deletions
--- a/services/core/java/com/android/server/tv/TvInputManagerService.java
+++ b/services/core/java/com/android/server/tv/TvInputManagerService.java
@@ -161,8 +161,10 @@ public final class TvInputManagerService extends SystemService {
        PackageMonitor monitor = new PackageMonitor() {
            private void buildTvInputList(String[] packages) {
                synchronized (mLock) {
-                    buildTvInputListLocked(getChangingUserId(), packages);
-                    buildTvContentRatingSystemListLocked(getChangingUserId());
+                    if (mCurrentUserId == getChangingUserId()) {
+                        buildTvInputListLocked(mCurrentUserId, packages);
+                        buildTvContentRatingSystemListLocked(mCurrentUserId);
+                    }
                }
            }