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

Commit 3588e597 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Re-SystemApi some fields/method that aren't in use."

parents c92035b1 a62496d8

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -34348,6 +34348,7 @@ 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, java.lang.String, java.lang.String, int, int, int);















    method public android.service.notification.Condition copy();















    method public int describeContents();










@@ -34379,7 +34380,6 @@ 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 abstract 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



+8
−0




























Original line number
Diff line number
Diff line








@@ -199,6 +199,14 @@ 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








@@ -36528,6 +36528,7 @@ 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, java.lang.String, java.lang.String, int, int, int);















    method public android.service.notification.Condition copy();















    method public int describeContents();










@@ -36559,7 +36560,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 abstract void onRequestConditions(int);













    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-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -34363,6 +34363,7 @@ 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, java.lang.String, java.lang.String, int, int, int);















    method public android.service.notification.Condition copy();















    method public int describeContents();










@@ -34394,7 +34395,6 @@ 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 abstract 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



+8
−0




























Original line number
Diff line number
Diff line








@@ -199,6 +199,14 @@ 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 {