From 7381daa0b99ef5beb224ffd2544a156af40e78d1 Mon Sep 17 00:00:00 2001 From: Chris Wren Date: Fri, 5 Sep 2014 11:30:32 -0400 Subject: [PATCH] remove unused matchesCallFilter(Bundle, int) Bug: 17402728 Change-Id: I0be7c70597a629ca0bd60b7230ffcc58e8e7aeac --- core/java/android/app/INotificationManager.aidl | 1 - .../server/notification/NotificationManagerService.java | 9 +-------- .../server/notification/ValidateNotificationPeople.java | 1 + 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/core/java/android/app/INotificationManager.aidl b/core/java/android/app/INotificationManager.aidl index 7d4512bd15097..bdcff381b1546 100644 --- a/core/java/android/app/INotificationManager.aidl +++ b/core/java/android/app/INotificationManager.aidl @@ -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); diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index bc538ed144175..2e746cffdf787 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -1470,14 +1470,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)); } }; diff --git a/services/core/java/com/android/server/notification/ValidateNotificationPeople.java b/services/core/java/com/android/server/notification/ValidateNotificationPeople.java index f266916d3646b..d49dc9a60a79a 100644 --- a/services/core/java/com/android/server/notification/ValidateNotificationPeople.java +++ b/services/core/java/com/android/server/notification/ValidateNotificationPeople.java @@ -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];