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

Commit ccce5d5d 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: 219079c5

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



Change-Id: I1cbe0436ee22c9793566f862c1b5d2b58f03c8d1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ba7d8ce7 219079c5

src/com/android/settings/notification/NotificationAccessConfirmationActivity.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -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);