Merge "Api review: AutomaticZenRule" into nyc-dev (2319dd3a) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −4

Original line number	Diff line number	Diff line
		@@ -4132,7 +4132,6 @@ package android.app {
		method public int describeContents();
		method public android.net.Uri getConditionId();
		method public long getCreationTime();
		method public java.lang.String getId();
		method public int getInterruptionFilter();
		method public java.lang.String getName();
		method public android.content.ComponentName getOwner();
		@@ -5228,14 +5227,14 @@ package android.app {
		}

		public class NotificationManager {
		method public android.app.AutomaticZenRule addAutomaticZenRule(android.app.AutomaticZenRule);
		method public java.lang.String addAutomaticZenRule(android.app.AutomaticZenRule);
		method public boolean areNotificationsEnabled();
		method public void cancel(int);
		method public void cancel(java.lang.String, int);
		method public void cancelAll();
		method public android.service.notification.StatusBarNotification[] getActiveNotifications();
		method public android.app.AutomaticZenRule getAutomaticZenRule(java.lang.String);
		method public java.util.List<android.app.AutomaticZenRule> getAutomaticZenRules();
		method public java.util.Map<java.lang.String, android.app.AutomaticZenRule> getAutomaticZenRules();
		method public final int getCurrentInterruptionFilter();
		method public int getImportance();
		method public android.app.NotificationManager.Policy getNotificationPolicy();
		@@ -5245,7 +5244,7 @@ package android.app {
		method public boolean removeAutomaticZenRule(java.lang.String);
		method public final void setInterruptionFilter(int);
		method public void setNotificationPolicy(android.app.NotificationManager.Policy);
		method public boolean updateAutomaticZenRule(android.app.AutomaticZenRule);
		method public boolean updateAutomaticZenRule(java.lang.String, android.app.AutomaticZenRule);
		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_ACCESS_GRANTED_CHANGED = "android.app.action.NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED";
		field public static final java.lang.String ACTION_NOTIFICATION_POLICY_CHANGED = "android.app.action.NOTIFICATION_POLICY_CHANGED";

api/system-current.txt

+3 −4

Original line number	Diff line number	Diff line
		@@ -4258,7 +4258,6 @@ package android.app {
		method public int describeContents();
		method public android.net.Uri getConditionId();
		method public long getCreationTime();
		method public java.lang.String getId();
		method public int getInterruptionFilter();
		method public java.lang.String getName();
		method public android.content.ComponentName getOwner();
		@@ -5360,14 +5359,14 @@ package android.app {
		}

		public class NotificationManager {
		method public android.app.AutomaticZenRule addAutomaticZenRule(android.app.AutomaticZenRule);
		method public java.lang.String addAutomaticZenRule(android.app.AutomaticZenRule);
		method public boolean areNotificationsEnabled();
		method public void cancel(int);
		method public void cancel(java.lang.String, int);
		method public void cancelAll();
		method public android.service.notification.StatusBarNotification[] getActiveNotifications();
		method public android.app.AutomaticZenRule getAutomaticZenRule(java.lang.String);
		method public java.util.List<android.app.AutomaticZenRule> getAutomaticZenRules();
		method public java.util.Map<java.lang.String, android.app.AutomaticZenRule> getAutomaticZenRules();
		method public final int getCurrentInterruptionFilter();
		method public int getImportance();
		method public android.app.NotificationManager.Policy getNotificationPolicy();
		@@ -5377,7 +5376,7 @@ package android.app {
		method public boolean removeAutomaticZenRule(java.lang.String);
		method public final void setInterruptionFilter(int);
		method public void setNotificationPolicy(android.app.NotificationManager.Policy);
		method public boolean updateAutomaticZenRule(android.app.AutomaticZenRule);
		method public boolean updateAutomaticZenRule(java.lang.String, android.app.AutomaticZenRule);
		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_ACCESS_GRANTED_CHANGED = "android.app.action.NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED";
		field public static final java.lang.String ACTION_NOTIFICATION_POLICY_CHANGED = "android.app.action.NOTIFICATION_POLICY_CHANGED";

api/test-current.txt

+3 −4

Original line number	Diff line number	Diff line
		@@ -4132,7 +4132,6 @@ package android.app {
		method public int describeContents();
		method public android.net.Uri getConditionId();
		method public long getCreationTime();
		method public java.lang.String getId();
		method public int getInterruptionFilter();
		method public java.lang.String getName();
		method public android.content.ComponentName getOwner();
		@@ -5228,14 +5227,14 @@ package android.app {
		}

		public class NotificationManager {
		method public android.app.AutomaticZenRule addAutomaticZenRule(android.app.AutomaticZenRule);
		method public java.lang.String addAutomaticZenRule(android.app.AutomaticZenRule);
		method public boolean areNotificationsEnabled();
		method public void cancel(int);
		method public void cancel(java.lang.String, int);
		method public void cancelAll();
		method public android.service.notification.StatusBarNotification[] getActiveNotifications();
		method public android.app.AutomaticZenRule getAutomaticZenRule(java.lang.String);
		method public java.util.List<android.app.AutomaticZenRule> getAutomaticZenRules();
		method public java.util.Map<java.lang.String, android.app.AutomaticZenRule> getAutomaticZenRules();
		method public final int getCurrentInterruptionFilter();
		method public int getImportance();
		method public android.app.NotificationManager.Policy getNotificationPolicy();
		@@ -5245,7 +5244,7 @@ package android.app {
		method public boolean removeAutomaticZenRule(java.lang.String);
		method public final void setInterruptionFilter(int);
		method public void setNotificationPolicy(android.app.NotificationManager.Policy);
		method public boolean updateAutomaticZenRule(android.app.AutomaticZenRule);
		method public boolean updateAutomaticZenRule(java.lang.String, android.app.AutomaticZenRule);
		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_ACCESS_GRANTED_CHANGED = "android.app.action.NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED";
		field public static final java.lang.String ACTION_NOTIFICATION_POLICY_CHANGED = "android.app.action.NOTIFICATION_POLICY_CHANGED";

core/java/android/app/AutomaticZenRule.java

+3 −23

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ public final class AutomaticZenRule implements Parcelable {
		private @InterruptionFilter int interruptionFilter;
		private Uri conditionId;
		private ComponentName owner;
		private String id;
		private long creationTime;

		/**
		@@ -63,9 +62,8 @@ public final class AutomaticZenRule implements Parcelable {
		* @hide
		*/
		public AutomaticZenRule(String name, ComponentName owner, Uri conditionId,
		int interruptionFilter, boolean enabled, String id, long creationTime) {
		int interruptionFilter, boolean enabled, long creationTime) {
		this(name, owner, conditionId, interruptionFilter, enabled);
		this.id = id;
		this.creationTime = creationTime;
		}

		@@ -77,9 +75,6 @@ public final class AutomaticZenRule implements Parcelable {
		interruptionFilter = source.readInt();
		conditionId = source.readParcelable(null);
		owner = source.readParcelable(null);
		if (source.readInt() == 1) {
		id = source.readString();
		}
		creationTime = source.readLong();
		}

		@@ -119,19 +114,12 @@ public final class AutomaticZenRule implements Parcelable {
		}

		/**
		* Returns the wall time in milliseconds when this rule was created, if known.
		* Returns the time this rule was created, represented as milliseconds since the epoch.
		*/
		public long getCreationTime() {
		return creationTime;
		}

		/**
		* Returns the unique identifier for this rule.
		*/
		public String getId() {
		return id;
		}

		/**
		* Sets the representation of the state that causes this rule to become active.
		*/
		@@ -178,12 +166,6 @@ public final class AutomaticZenRule implements Parcelable {
		dest.writeInt(interruptionFilter);
		dest.writeParcelable(conditionId, 0);
		dest.writeParcelable(owner, 0);
		if (id != null) {
		dest.writeInt(1);
		dest.writeString(id);
		} else {
		dest.writeInt(0);
		}
		dest.writeLong(creationTime);
		}

		@@ -195,7 +177,6 @@ public final class AutomaticZenRule implements Parcelable {
		.append(",interruptionFilter=").append(interruptionFilter)
		.append(",conditionId=").append(conditionId)
		.append(",owner=").append(owner)
		.append(",id=").append(id)
		.append(",creationTime=").append(creationTime)
		.append(']').toString();
		}
		@@ -210,13 +191,12 @@ public final class AutomaticZenRule implements Parcelable {
		&& other.interruptionFilter == interruptionFilter
		&& Objects.equals(other.conditionId, conditionId)
		&& Objects.equals(other.owner, owner)
		&& Objects.equals(other.id, id)
		&& other.creationTime == creationTime;
		}

		@Override
		public int hashCode() {
		return Objects.hash(enabled, name, interruptionFilter, conditionId, owner, id, creationTime);
		return Objects.hash(enabled, name, interruptionFilter, conditionId, owner, creationTime);
		}

		public static final Parcelable.Creator<AutomaticZenRule> CREATOR

core/java/android/app/INotificationManager.aidl

+3 −3

Original line number	Diff line number	Diff line
		@@ -97,9 +97,9 @@ interface INotificationManager
		boolean isNotificationPolicyAccessGrantedForPackage(String pkg);
		void setNotificationPolicyAccessGranted(String pkg, boolean granted);
		AutomaticZenRule getAutomaticZenRule(String id);
		List<AutomaticZenRule> getAutomaticZenRules();
		AutomaticZenRule addAutomaticZenRule(in AutomaticZenRule automaticZenRule);
		boolean updateAutomaticZenRule(in AutomaticZenRule automaticZenRule);
		List<ZenModeConfig.ZenRule> getZenRules();
		String addAutomaticZenRule(in AutomaticZenRule automaticZenRule);
		boolean updateAutomaticZenRule(String id, in AutomaticZenRule automaticZenRule);
		boolean removeAutomaticZenRule(String id);
		boolean removeAutomaticZenRules(String packageName);
		int getRuleInstanceCount(in ComponentName owner);