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

Commit 4ed0e8cf authored Mar 08, 2016 by Julia Reynolds Committed by Android (Google) Code Review Mar 08, 2016

Merge "Condition cleanup." into nyc-dev

parents e0dc3f29 1d6d16d6

api/current.txt

+3 −1

Original line number	Diff line number	Diff line
		@@ -34426,8 +34426,9 @@ package android.service.media {
		package android.service.notification {

		public class Condition implements android.os.Parcelable {
		ctor public Condition(android.net.Uri, java.lang.String, java.lang.String, java.lang.String, int);
		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);
		method public android.service.notification.Condition copy();
		method public int describeContents();
		method public static boolean isValidId(android.net.Uri, java.lang.String);
		@@ -34458,6 +34459,7 @@ package android.service.notification {
		method public final void notifyConditions(android.service.notification.Condition...);
		method public android.os.IBinder onBind(android.content.Intent);
		method public abstract void onConnected();
		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";

api/removed.txt

+0 −8

Original line number	Diff line number	Diff line
		@@ -201,14 +201,6 @@ package android.provider {

		}

		package android.service.notification {

		public abstract class ConditionProviderService extends android.app.Service {
		method public void onRequestConditions(int);
		}

		}

		package android.test.mock {

		public deprecated class MockPackageManager extends android.content.pm.PackageManager {

api/system-current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -36916,8 +36916,9 @@ package android.service.media {
		package android.service.notification {

		public class Condition implements android.os.Parcelable {
		ctor public Condition(android.net.Uri, java.lang.String, java.lang.String, java.lang.String, int);
		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);
		method public android.service.notification.Condition copy();
		method public int describeContents();
		method public static boolean isValidId(android.net.Uri, java.lang.String);

api/test-current.txt

+3 −1

Original line number	Diff line number	Diff line
		@@ -34443,8 +34443,9 @@ package android.service.media {
		package android.service.notification {

		public class Condition implements android.os.Parcelable {
		ctor public Condition(android.net.Uri, java.lang.String, java.lang.String, java.lang.String, int);
		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);
		method public android.service.notification.Condition copy();
		method public int describeContents();
		method public static boolean isValidId(android.net.Uri, java.lang.String);
		@@ -34475,6 +34476,7 @@ package android.service.notification {
		method public final void notifyConditions(android.service.notification.Condition...);
		method public android.os.IBinder onBind(android.content.Intent);
		method public abstract void onConnected();
		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";

api/test-removed.txt

+0 −8

Original line number	Diff line number	Diff line
		@@ -201,14 +201,6 @@ package android.provider {

		}

		package android.service.notification {

		public abstract class ConditionProviderService extends android.app.Service {
		method public void onRequestConditions(int);
		}

		}

		package android.test.mock {

		public deprecated class MockPackageManager extends android.content.pm.PackageManager {