Merge "Update TV input list upon package state changes in Kids profile" into sc-dev (a9371950) · Commits · e / os / android_frameworks_base

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

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -209,10 +209,11 @@ public final class TvInputManagerService extends SystemService {
	private void registerBroadcastReceivers() {		private void registerBroadcastReceivers() {
	PackageMonitor monitor = new PackageMonitor() {		PackageMonitor monitor = new PackageMonitor() {
	private void buildTvInputList(String[] packages) {		private void buildTvInputList(String[] packages) {
			int userId = getChangingUserId();
	synchronized (mLock) {		synchronized (mLock) {
	if (mCurrentUserId == getChangingUserId()) {		if (mCurrentUserId == userId \|\| mRunningProfiles.contains(userId)) {
	buildTvInputListLocked(mCurrentUserId, packages);		buildTvInputListLocked(userId, packages);
	buildTvContentRatingSystemListLocked(mCurrentUserId);		buildTvContentRatingSystemListLocked(userId);
	}		}
	}		}
	}		}