Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84700729 authored May 25, 2016 by Julia Reynolds Committed by android-build-merger May 25, 2016

Merge changes from topic \'cps\' into nyc-dev am: d3827be1 am: 5bf51f02

am: 88be37e5

* commit '88be37e5':
  Api updates.
  Note timezone changes.

Change-Id: I01c59a43b65c51a3968d16f6791c703fd495be5e

parents ca4da27f 88be37e5

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -34680,7 +34680,7 @@ package android.service.media {

		package android.service.notification {

		public class Condition implements android.os.Parcelable {
		public final class Condition implements android.os.Parcelable {
		ctor public Condition(android.net.Uri, java.lang.String, int);
		ctor public Condition(android.net.Uri, java.lang.String, java.lang.String, java.lang.String, int, int, int);
		ctor public Condition(android.os.Parcel);
		@@ -34717,7 +34717,7 @@ package android.service.notification {
		method public void onRequestConditions(int);
		method public abstract void onSubscribe(android.net.Uri);
		method public abstract void onUnsubscribe(android.net.Uri);
		field public static final java.lang.String EXTRA_RULE_ID = "android.content.automatic.ruleId";
		field public static final java.lang.String EXTRA_RULE_ID = "android.service.notification.extra.RULE_ID";
		field public static final java.lang.String META_DATA_CONFIGURATION_ACTIVITY = "android.service.zen.automatic.configurationActivity";
		field public static final java.lang.String META_DATA_RULE_INSTANCE_LIMIT = "android.service.zen.automatic.ruleInstanceLimit";
		field public static final java.lang.String META_DATA_RULE_TYPE = "android.service.zen.automatic.ruleType";

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -37403,7 +37403,7 @@ package android.service.notification {
		field public static final java.lang.String NEEDS_AUTOGROUPING_KEY = "autogroup_needed";
		}

		public class Condition implements android.os.Parcelable {
		public final class Condition implements android.os.Parcelable {
		ctor public Condition(android.net.Uri, java.lang.String, int);
		ctor public Condition(android.net.Uri, java.lang.String, java.lang.String, java.lang.String, int, int, int);
		ctor public Condition(android.os.Parcel);
		@@ -37440,7 +37440,7 @@ package android.service.notification {
		method public void onRequestConditions(int);
		method public abstract void onSubscribe(android.net.Uri);
		method public abstract void onUnsubscribe(android.net.Uri);
		field public static final java.lang.String EXTRA_RULE_ID = "android.content.automatic.ruleId";
		field public static final java.lang.String EXTRA_RULE_ID = "android.service.notification.extra.RULE_ID";
		field public static final java.lang.String META_DATA_CONFIGURATION_ACTIVITY = "android.service.zen.automatic.configurationActivity";
		field public static final java.lang.String META_DATA_RULE_INSTANCE_LIMIT = "android.service.zen.automatic.ruleInstanceLimit";
		field public static final java.lang.String META_DATA_RULE_TYPE = "android.service.zen.automatic.ruleType";

api/test-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -34758,7 +34758,7 @@ package android.service.media {

		package android.service.notification {

		public class Condition implements android.os.Parcelable {
		public final class Condition implements android.os.Parcelable {
		ctor public Condition(android.net.Uri, java.lang.String, int);
		ctor public Condition(android.net.Uri, java.lang.String, java.lang.String, java.lang.String, int, int, int);
		ctor public Condition(android.os.Parcel);
		@@ -34795,7 +34795,7 @@ package android.service.notification {
		method public void onRequestConditions(int);
		method public abstract void onSubscribe(android.net.Uri);
		method public abstract void onUnsubscribe(android.net.Uri);
		field public static final java.lang.String EXTRA_RULE_ID = "android.content.automatic.ruleId";
		field public static final java.lang.String EXTRA_RULE_ID = "android.service.notification.extra.RULE_ID";
		field public static final java.lang.String META_DATA_CONFIGURATION_ACTIVITY = "android.service.zen.automatic.configurationActivity";
		field public static final java.lang.String META_DATA_RULE_INSTANCE_LIMIT = "android.service.zen.automatic.ruleInstanceLimit";
		field public static final java.lang.String META_DATA_RULE_TYPE = "android.service.zen.automatic.ruleType";

core/java/android/service/notification/Condition.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ import java.util.Objects;
		* {@link ConditionProviderService} that owns the rule. Used to tell the system to enter Do Not
		* Disturb mode and request that the system exit Do Not Disturb mode.
		*/
		public class Condition implements Parcelable {
		public final class Condition implements Parcelable {

		@SystemApi
		public static final String SCHEME = "condition";

core/java/android/service/notification/ConditionProviderService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@ public abstract class ConditionProviderService extends Service {
		/**
		* A String rule id extra passed to {@link #META_DATA_CONFIGURATION_ACTIVITY}.
		*/
		public static final String EXTRA_RULE_ID = "android.content.automatic.ruleId";
		public static final String EXTRA_RULE_ID = "android.service.notification.extra.RULE_ID";

		/**
		* Called when this service is connected.