Merge "NoListener: meetsInterruptionFilter -> matchesInterruptionFilter" into lmp-dev (faa9957f) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -27351,7 +27351,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 {

+8 −0

Original line number	Diff line number	Diff line
		@@ -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 {

+14 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}