Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0be2e7fe authored by Guojing Yuan's avatar Guojing Yuan Committed by Automerger Merge Worker
Browse files

Merge "[CDM] Checks NLS component name instead of package name" into tm-dev...

Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d am: 7d438b77 am: 900dbd8d am: 31e73703

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



Change-Id: Ie3e2d20adf07f30e685065a70b1f8e6dece7cf5d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf95fa5a 31e73703
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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);