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

Commit 135ce76a authored by Chris Wren's avatar Chris Wren Committed by Android (Google) Code Review
Browse files

Merge "remove unused matchesCallFilter(Bundle, int)" into lmp-dev

parents c30afd1e 7381daa0

core/java/android/app/INotificationManager.aidl

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ interface INotificationManager 


    ComponentName getEffectsSuppressor();

    boolean matchesCallFilter(in Bundle extras);

    boolean matchesCallFilterAsUser(in Bundle extras, int userId);



    ZenModeConfig getZenModeConfig();

    boolean setZenModeConfig(in ZenModeConfig config);

services/core/java/com/android/server/notification/NotificationManagerService.java

+1 −8
Original line number Diff line number Diff line
@@ -1471,14 +1471,7 @@ public class NotificationManagerService extends SystemService { 
        @Override

        public boolean matchesCallFilter(Bundle extras) {

            enforceSystemOrSystemUI("INotificationManager.matchesCallFilter");

            return matchesCallFilterAsUser(extras, Binder.getCallingUid());

        }



        @Override

        public boolean matchesCallFilterAsUser(Bundle extras, int userId) {

            enforceSystemOrSystemUI("INotificationManager.matchesCallFilter");

            UserHandle userHandle = new UserHandle(userId);

            return mZenModeHelper.matchesCallFilter(userHandle, extras,

            return mZenModeHelper.matchesCallFilter(UserHandle.getCallingUserHandle(), extras,

                    mRankingHelper.findExtractor(ValidateNotificationPeople.class));

        }

    };

services/core/java/com/android/server/notification/ValidateNotificationPeople.java

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ public class ValidateNotificationPeople implements NotificationSignalExtractor { 
    }



    public float getContactAffinity(UserHandle userHandle, Bundle extras) {

        if (DEBUG) Slog.d(TAG, "checking affinity for " + userHandle);

        if (extras == null) return NONE;

        final String key = Long.toString(System.nanoTime());

        final float[] affinityOut = new float[1];