Merge "[NMS] Call isServiceTokenValidLocked with lock." (e672a933) · Commits · e / os / android_frameworks_base

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -9404,10 +9404,16 @@ public class NotificationManagerService extends SystemService {
		* given NAS is bound in.
		*/
		private boolean isInteractionVisibleToListener(ManagedServiceInfo info, int userId) {
		boolean isAssistantService = mAssistants.isServiceTokenValidLocked(info.service);
		boolean isAssistantService = isServiceTokenValid(info.service);
		return !isAssistantService \|\| info.isSameUser(userId);
		}

		private boolean isServiceTokenValid(IInterface service) {
		synchronized (mNotificationLock) {
		return mAssistants.isServiceTokenValidLocked(service);
		}
		}

		private boolean isPackageSuspendedForUser(String pkg, int uid) {
		final long identity = Binder.clearCallingIdentity();
		int userId = UserHandle.getUserId(uid);
		@@ -10652,7 +10658,7 @@ public class NotificationManagerService extends SystemService {
		BackgroundThread.getHandler().post(() -> {
		if (info.isSystem
		\|\| hasCompanionDevice(info)
		\|\| mAssistants.isServiceTokenValidLocked(info.service)) {
		\|\| isServiceTokenValid(info.service)) {
		notifyNotificationChannelChanged(
		info, pkg, user, channel, modificationType);
		}