From 2d783fc167ea0eb0b6e950c7a048070fd89a24a4 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Fri, 7 Sep 2018 13:38:21 -0400
Subject: [PATCH] On CPS rebind, check if package is allowed

Test: cts test
Change-Id: If24b91f20cd5f2074223c2857add1879b76cb383
Fixes: 113634185
---
 .../java/com/android/server/notification/ManagedServices.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java
index 340ae0ad637ac..7751f5f9bcb85 100644
--- a/services/core/java/com/android/server/notification/ManagedServices.java
+++ b/services/core/java/com/android/server/notification/ManagedServices.java
@@ -694,7 +694,8 @@ abstract public class ManagedServices {
 
             for (int userId : userIds) {
                 if (enabled) {
-                    if (isPackageOrComponentAllowed(component.toString(), userId)) {
+                    if (isPackageOrComponentAllowed(component.toString(), userId)
+                            || isPackageOrComponentAllowed(component.getPackageName(), userId)) {
                         registerServiceLocked(component, userId);
                     } else {
                         Slog.d(TAG, component + " no longer has permission to be bound");