From b0fce927bff15296f93a5bb08e9f005f4d905103 Mon Sep 17 00:00:00 2001
From: Guojing Yuan <guojing@google.com>
Date: Tue, 28 Jan 2025 11:57:16 -0800
Subject: [PATCH] [CDM] Checks NLS component name instead of package name

Bug: 386216637
Flag: EXEMPT bugfix
Test: CTS

Change-Id: I1be52fcb3d52b8b84353ea00fd57d8360ddd966c
Merged-In: I1be52fcb3d52b8b84353ea00fd57d8360ddd966c
(cherry picked from commit f5ed187ffb6f5a25ac1c06a1e8b023b0c7d8d4b8)
---
 .../notification/NotificationAccessConfirmationActivity.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
index 253ae88e4b3..79e99fed4e5 100644
--- a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
+++ b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
@@ -122,7 +122,7 @@ public class NotificationAccessConfirmationActivity extends Activity
                 NLSIntent, /* flags */ 0, mUserId);
         boolean hasNLSIntentFilter = false;
         for (ResolveInfo service : matchedServiceList) {
-            if (service.serviceInfo.packageName.equals(mComponentName.getPackageName())) {
+            if (service.serviceInfo.getComponentName().equals(mComponentName)) {
                 if (!requiredPermission.equals(service.serviceInfo.permission)) {
                     Slog.e(LOG_TAG, "Service " + mComponentName + " lacks permission "
                             + requiredPermission);
@@ -156,7 +156,7 @@ public class NotificationAccessConfirmationActivity extends Activity
                 .installContent(p);
         // Consistent with the permission dialog
         // Used instead of p.mCancelable as that is only honored for AlertDialog
-        getWindow().setCloseOnTouchOutside(false); 
+        getWindow().setCloseOnTouchOutside(false);
     }
 
     private void onAllow() {