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

Commit 9a49d6c8 authored Mar 08, 2016 by Julia Reynolds Committed by android-build-merger Mar 08, 2016

Merge "Condition cleanup." into nyc-dev am: 4ed0e8cf

am: ad23e7bf

* commit 'ad23e7bf':
  Condition cleanup.

parents 933aa8bb ad23e7bf

api/current.txt

+3 −1

Original line number	Diff line number	Diff line
		@@ -34432,8 +34432,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);
		@@ -34464,6 +34465,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
		@@ -36922,8 +36922,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
		@@ -34449,8 +34449,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);
		@@ -34481,6 +34482,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 {