From ce7d6d292b2309eff95d4206b09858f13fff5213 Mon Sep 17 00:00:00 2001
From: Christoph Studer <chstuder@google.com>
Date: Tue, 26 Aug 2014 19:21:31 +0200
Subject: [PATCH] NoListener: meetsInterruptionFilter ->
 matchesInterruptionFilter

Rename Ranking.meetsInterruptionFilter() to matchesInterruptionFilter()
as suggested by API council.

Marking the old version @removed for now, will remove once prebuilds had
the chance to update.

Bug: 17255109
Change-Id: Iaee094df2dddf82029e127c194ea88581d1a48bb
---
 api/current.txt                                |  2 +-
 api/removed.txt                                |  8 ++++++++
 .../NotificationListenerService.java           | 18 ++++++++++++++----
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 85a3fc526480b..d79ffbad839eb 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -27345,7 +27345,7 @@ package android.service.notification {
     method public java.lang.String getKey();
     method public int getRank();
     method public boolean isAmbient();
-    method public boolean meetsInterruptionFilter();
+    method public boolean matchesInterruptionFilter();
   }
 
   public static class NotificationListenerService.RankingMap implements android.os.Parcelable {
diff --git a/api/removed.txt b/api/removed.txt
index 93484de155aa2..1b8aef4c6f946 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -16,6 +16,14 @@ package android.os {
 
 }
 
+package android.service.notification {
+
+  public static class NotificationListenerService.Ranking {
+    method public boolean meetsInterruptionFilter();
+  }
+
+}
+
 package android.view {
 
   public static class WindowManager.LayoutParams extends android.view.ViewGroup.LayoutParams implements android.os.Parcelable {
diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java
index 4651d7e898703..450b9a797e6ce 100644
--- a/core/java/android/service/notification/NotificationListenerService.java
+++ b/core/java/android/service/notification/NotificationListenerService.java
@@ -539,7 +539,7 @@ public abstract class NotificationListenerService extends Service {
         private String mKey;
         private int mRank = -1;
         private boolean mIsAmbient;
-        private boolean mMeetsInterruptionFilter;
+        private boolean mMatchesInterruptionFilter;
 
         public Ranking() {}
 
@@ -571,17 +571,27 @@ public abstract class NotificationListenerService extends Service {
         /**
          * Returns whether the notification meets the user's interruption
          * filter.
+         *
+         * @removed
          */
         public boolean meetsInterruptionFilter() {
-            return mMeetsInterruptionFilter;
+            return mMatchesInterruptionFilter;
+        }
+
+        /**
+         * Returns whether the notification matches the user's interruption
+         * filter.
+         */
+        public boolean matchesInterruptionFilter() {
+            return mMatchesInterruptionFilter;
         }
 
         private void populate(String key, int rank, boolean isAmbient,
-                boolean meetsInterruptionFilter) {
+                boolean matchesInterruptionFilter) {
             mKey = key;
             mRank = rank;
             mIsAmbient = isAmbient;
-            mMeetsInterruptionFilter = meetsInterruptionFilter;
+            mMatchesInterruptionFilter = matchesInterruptionFilter;
         }
     }