Merge "Zen: Simplify notification policy api, add zenmode api." into mnc-dev (d89a6b2a) · Commits · e / os / android_frameworks_base

api/current.txt

+22 −19

Original line number	Diff line number	Diff line
		@@ -5145,17 +5145,31 @@ package android.app {
		method public void cancel(java.lang.String, int);
		method public void cancelAll();
		method public android.service.notification.StatusBarNotification[] getActiveNotifications();
		method public android.app.NotificationManager.Policy getNotificationPolicy(android.app.NotificationManager.Policy.Token);
		method public boolean isNotificationPolicyTokenValid(android.app.NotificationManager.Policy.Token);
		method public final int getCurrentInterruptionFilter();
		method public android.app.NotificationManager.Policy getNotificationPolicy();
		method public boolean isNotificationPolicyAccessGranted();
		method public void notify(int, android.app.Notification);
		method public void notify(java.lang.String, int, android.app.Notification);
		method public void requestNotificationPolicyToken(android.app.NotificationManager.Policy.Token.RequestCallback, android.os.Handler);
		method public void setNotificationPolicy(android.app.NotificationManager.Policy.Token, android.app.NotificationManager.Policy);
		method public void requestPolicyAccess(android.app.NotificationManager.NotificationPolicyAccessRequestCallback, android.os.Handler);
		method public final void setInterruptionFilter(int);
		method public void setNotificationPolicy(android.app.NotificationManager.Policy);
		field public static final java.lang.String ACTION_INTERRUPTION_FILTER_CHANGED = "android.app.action.INTERRUPTION_FILTER_CHANGED";
		field public static final java.lang.String ACTION_NOTIFICATION_POLICY_CHANGED = "android.app.action.NOTIFICATION_POLICY_CHANGED";
		field public static final int INTERRUPTION_FILTER_ALARMS = 4; // 0x4
		field public static final int INTERRUPTION_FILTER_ALL = 1; // 0x1
		field public static final int INTERRUPTION_FILTER_NONE = 3; // 0x3
		field public static final int INTERRUPTION_FILTER_PRIORITY = 2; // 0x2
		field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0
		}

		public static abstract class NotificationManager.NotificationPolicyAccessRequestCallback {
		ctor public NotificationManager.NotificationPolicyAccessRequestCallback();
		method public abstract void onAccessDenied();
		method public abstract void onAccessGranted();
		}

		public static class NotificationManager.Policy implements android.os.Parcelable {
		ctor public NotificationManager.Policy(int, int);
		ctor public NotificationManager.Policy(int, int, int);
		method public int describeContents();
		method public static java.lang.String priorityCategoriesToString(int);
		method public static java.lang.String prioritySendersToString(int);
		@@ -5169,20 +5183,9 @@ package android.app {
		field public static final int PRIORITY_SENDERS_ANY = 0; // 0x0
		field public static final int PRIORITY_SENDERS_CONTACTS = 1; // 0x1
		field public static final int PRIORITY_SENDERS_STARRED = 2; // 0x2
		field public final int priorityCallSenders;
		field public final int priorityCategories;
		field public final int prioritySenders;
		}

		public static class NotificationManager.Policy.Token implements android.os.Parcelable {
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.NotificationManager.Policy.Token> CREATOR;
		}

		public static abstract class NotificationManager.Policy.Token.RequestCallback {
		ctor public NotificationManager.Policy.Token.RequestCallback();
		method public abstract void onTokenDenied();
		method public abstract void onTokenGranted(android.app.NotificationManager.Policy.Token);
		field public final int priorityMessageSenders;
		}

		public final class PendingIntent implements android.os.Parcelable {
		@@ -26543,6 +26546,7 @@ package android.provider {
		field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS";
		field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS";
		field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS";
		field public static final java.lang.String ACTION_ZEN_ACCESS_SETTINGS = "android.settings.ZEN_ACCESS_SETTINGS";
		field public static final java.lang.String AUTHORITY = "settings";
		field public static final java.lang.String EXTRA_ACCOUNT_TYPES = "account_types";
		field public static final java.lang.String EXTRA_AIRPLANE_MODE_ENABLED = "airplane_mode_enabled";
		@@ -28842,7 +28846,6 @@ package android.service.notification {
		method public final int getCurrentInterruptionFilter();
		method public final int getCurrentListenerHints();
		method public android.service.notification.NotificationListenerService.RankingMap getCurrentRanking();
		method public final android.app.NotificationManager.Policy.Token getNotificationPolicyToken();
		method public android.os.IBinder onBind(android.content.Intent);
		method public void onInterruptionFilterChanged(int);
		method public void onListenerConnected();

api/system-current.txt

+22 −19

Original line number	Diff line number	Diff line
		@@ -5237,17 +5237,31 @@ package android.app {
		method public void cancel(java.lang.String, int);
		method public void cancelAll();
		method public android.service.notification.StatusBarNotification[] getActiveNotifications();
		method public android.app.NotificationManager.Policy getNotificationPolicy(android.app.NotificationManager.Policy.Token);
		method public boolean isNotificationPolicyTokenValid(android.app.NotificationManager.Policy.Token);
		method public final int getCurrentInterruptionFilter();
		method public android.app.NotificationManager.Policy getNotificationPolicy();
		method public boolean isNotificationPolicyAccessGranted();
		method public void notify(int, android.app.Notification);
		method public void notify(java.lang.String, int, android.app.Notification);
		method public void requestNotificationPolicyToken(android.app.NotificationManager.Policy.Token.RequestCallback, android.os.Handler);
		method public void setNotificationPolicy(android.app.NotificationManager.Policy.Token, android.app.NotificationManager.Policy);
		method public void requestPolicyAccess(android.app.NotificationManager.NotificationPolicyAccessRequestCallback, android.os.Handler);
		method public final void setInterruptionFilter(int);
		method public void setNotificationPolicy(android.app.NotificationManager.Policy);
		field public static final java.lang.String ACTION_INTERRUPTION_FILTER_CHANGED = "android.app.action.INTERRUPTION_FILTER_CHANGED";
		field public static final java.lang.String ACTION_NOTIFICATION_POLICY_CHANGED = "android.app.action.NOTIFICATION_POLICY_CHANGED";
		field public static final int INTERRUPTION_FILTER_ALARMS = 4; // 0x4
		field public static final int INTERRUPTION_FILTER_ALL = 1; // 0x1
		field public static final int INTERRUPTION_FILTER_NONE = 3; // 0x3
		field public static final int INTERRUPTION_FILTER_PRIORITY = 2; // 0x2
		field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0
		}

		public static abstract class NotificationManager.NotificationPolicyAccessRequestCallback {
		ctor public NotificationManager.NotificationPolicyAccessRequestCallback();
		method public abstract void onAccessDenied();
		method public abstract void onAccessGranted();
		}

		public static class NotificationManager.Policy implements android.os.Parcelable {
		ctor public NotificationManager.Policy(int, int);
		ctor public NotificationManager.Policy(int, int, int);
		method public int describeContents();
		method public static java.lang.String priorityCategoriesToString(int);
		method public static java.lang.String prioritySendersToString(int);
		@@ -5261,20 +5275,9 @@ package android.app {
		field public static final int PRIORITY_SENDERS_ANY = 0; // 0x0
		field public static final int PRIORITY_SENDERS_CONTACTS = 1; // 0x1
		field public static final int PRIORITY_SENDERS_STARRED = 2; // 0x2
		field public final int priorityCallSenders;
		field public final int priorityCategories;
		field public final int prioritySenders;
		}

		public static class NotificationManager.Policy.Token implements android.os.Parcelable {
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.NotificationManager.Policy.Token> CREATOR;
		}

		public static abstract class NotificationManager.Policy.Token.RequestCallback {
		ctor public NotificationManager.Policy.Token.RequestCallback();
		method public abstract void onTokenDenied();
		method public abstract void onTokenGranted(android.app.NotificationManager.Policy.Token);
		field public final int priorityMessageSenders;
		}

		public final class PendingIntent implements android.os.Parcelable {
		@@ -28556,6 +28559,7 @@ package android.provider {
		field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS";
		field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS";
		field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS";
		field public static final java.lang.String ACTION_ZEN_ACCESS_SETTINGS = "android.settings.ZEN_ACCESS_SETTINGS";
		field public static final java.lang.String AUTHORITY = "settings";
		field public static final java.lang.String EXTRA_ACCOUNT_TYPES = "account_types";
		field public static final java.lang.String EXTRA_AIRPLANE_MODE_ENABLED = "airplane_mode_enabled";
		@@ -30896,7 +30900,6 @@ package android.service.notification {
		method public final int getCurrentInterruptionFilter();
		method public final int getCurrentListenerHints();
		method public android.service.notification.NotificationListenerService.RankingMap getCurrentRanking();
		method public final android.app.NotificationManager.Policy.Token getNotificationPolicyToken();
		method public android.os.IBinder onBind(android.content.Intent);
		method public void onInterruptionFilterChanged(int);
		method public void onListenerConnected();

core/java/android/app/INotificationManager.aidl

+8 −5

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ interface INotificationManager
		void requestInterruptionFilterFromListener(in INotificationListener token, int interruptionFilter);
		int getInterruptionFilterFromListener(in INotificationListener token);
		void setOnNotificationPostedTrimFromListener(in INotificationListener token, int trim);
		NotificationManager.Policy.Token getPolicyTokenFromListener(in INotificationListener listener);
		void setInterruptionFilter(String pkg, int interruptionFilter);

		ComponentName getEffectsSuppressor();
		boolean matchesCallFilter(in Bundle extras);
		@@ -87,10 +87,13 @@ interface INotificationManager
		oneway void setZenMode(int mode, in Uri conditionId, String reason);
		oneway void notifyConditions(String pkg, in IConditionProvider provider, in Condition[] conditions);
		oneway void requestZenModeConditions(in IConditionListener callback, int relevance);
		oneway void requestNotificationPolicyToken(String pkg, in INotificationManagerCallback callback);
		boolean isNotificationPolicyTokenValid(String pkg, in NotificationManager.Policy.Token token);
		NotificationManager.Policy getNotificationPolicy(in NotificationManager.Policy.Token token);
		void setNotificationPolicy(in NotificationManager.Policy.Token token, in NotificationManager.Policy policy);
		oneway void requestNotificationPolicyAccess(String pkg, in INotificationManagerCallback callback);
		boolean isNotificationPolicyAccessGranted(String pkg);
		NotificationManager.Policy getNotificationPolicy(String pkg);
		void setNotificationPolicy(String pkg, in NotificationManager.Policy policy);
		String[] getPackagesRequestingNotificationPolicyAccess();
		boolean isNotificationPolicyAccessGrantedForPackage(String pkg);
		void setNotificationPolicyAccessGranted(String pkg, boolean granted);

		byte[] getBackupPayload(int user);
		void applyRestore(in byte[] payload, int user);

core/java/android/app/INotificationManagerCallback.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,5 +20,5 @@ import android.app.NotificationManager;

		/** @hide */
		oneway interface INotificationManagerCallback {
		void onPolicyToken(in NotificationManager.Policy.Token token);
		void onPolicyRequestResult(boolean granted);
		}

core/java/android/app/NotificationManager.aidl

+0 −1

Original line number	Diff line number	Diff line
		@@ -17,4 +17,3 @@
		package android.app;

		parcelable NotificationManager.Policy;
		parcelable NotificationManager.Policy.Token;
		No newline at end of file