PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47 am: 7d438b77b4 am: 900dbd8df9

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520

Change-Id: Ie16c398ccdb50d4aadb345de6d02a86dcd2b3055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Guojing Yuan
2025-03-12 13:06:18 -07:00
committed by Automerger Merge Worker
parent c467e11211 900dbd8df9
commit d46a401c18
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
View File

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