Merge "Move companion device check to the handler" into oc-dev (f1c14812) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/notification/NotificationManagerService.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -5089,15 +5089,15 @@ public class NotificationManagerService extends SystemService {
		if (!serviceInfo.enabledAndUserMatches(UserHandle.getCallingUserId())) {
		continue;
		}
		if (!hasCompanionDevice(serviceInfo)) {
		continue;
		}

		mHandler.post(new Runnable() {
		@Override
		public void run() {
		if (hasCompanionDevice(serviceInfo)) {
		notifyNotificationChannelChanged(
		serviceInfo, pkg, user, channel, modificationType);
		}
		}
		});
		}
		}
		@@ -5112,15 +5112,15 @@ public class NotificationManagerService extends SystemService {
		if (!serviceInfo.enabledAndUserMatches(UserHandle.getCallingUserId())) {
		continue;
		}
		if (!hasCompanionDevice(serviceInfo)) {
		continue;
		}

		mHandler.post(new Runnable() {
		@Override
		public void run() {
		if (hasCompanionDevice(serviceInfo)) {
		notifyNotificationChannelGroupChanged(
		serviceInfo, pkg, user, group, modificationType);
		}
		}
		});
		}
		}