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

Commit 77b2cc92 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Ranker --> Assistant. 

Rename ranker to assistant and make some of the methods public.
Delete the ext services ranker and restore the listener-type
lifecycle to the assistant.

Test: manual. add a notification assistant and verify it gets
assistant and listener callbacks.

Change-Id: Ia3406c8c14d923426c1b8a6d8b5187efe64c31c3
parent 67387af7

api/current.txt

+44 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ package android { 
    field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD";

    field public static final java.lang.String BIND_MIDI_DEVICE_SERVICE = "android.permission.BIND_MIDI_DEVICE_SERVICE";

    field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";

    field public static final java.lang.String BIND_NOTIFICATION_ASSISTANT_SERVICE = "android.permission.BIND_NOTIFICATION_ASSISTANT_SERVICE";

    field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";

    field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE";

    field public static final java.lang.String BIND_QUICK_SETTINGS_TILE = "android.permission.BIND_QUICK_SETTINGS_TILE";
@@ -34834,6 +34835,21 @@ package android.service.media { 














package android.service.notification {



























  public final class Adjustment implements android.os.Parcelable {













    ctor public Adjustment(java.lang.String, java.lang.String, int, android.os.Bundle, java.lang.CharSequence, android.net.Uri, int);













    ctor protected Adjustment(android.os.Parcel);













    method public int describeContents();













    method public java.lang.CharSequence getExplanation();













    method public int getImportance();













    method public java.lang.String getKey();













    method public java.lang.String getPackage();













    method public android.net.Uri getReference();













    method public android.os.Bundle getSignals();













    method public int getUser();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.service.notification.Adjustment> CREATOR;













  }



























  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);










@@ -34880,6 +34896,34 @@ package android.service.notification {













    field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.ConditionProviderService";















  }



























  public abstract class NotificationAssistantService extends android.service.notification.NotificationListenerService {













    ctor public NotificationAssistantService();













    method public final void adjustNotification(android.service.notification.Adjustment);













    method public final void adjustNotifications(java.util.List<android.service.notification.Adjustment>);













    method public final android.os.IBinder onBind(android.content.Intent);













    method public abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);













    method public void onNotificationRemoved(java.lang.String, long, int);













    field public static final int REASON_APP_CANCEL = 8; // 0x8













    field public static final int REASON_APP_CANCEL_ALL = 9; // 0x9













    field public static final int REASON_CHANNEL_BANNED = 17; // 0x11













    field public static final int REASON_DELEGATE_CANCEL = 2; // 0x2













    field public static final int REASON_DELEGATE_CANCEL_ALL = 3; // 0x3













    field public static final int REASON_DELEGATE_CLICK = 1; // 0x1













    field public static final int REASON_DELEGATE_ERROR = 4; // 0x4













    field public static final int REASON_GROUP_OPTIMIZATION = 13; // 0xd













    field public static final int REASON_GROUP_SUMMARY_CANCELED = 12; // 0xc













    field public static final int REASON_LISTENER_CANCEL = 10; // 0xa













    field public static final int REASON_LISTENER_CANCEL_ALL = 11; // 0xb













    field public static final int REASON_PACKAGE_BANNED = 7; // 0x7













    field public static final int REASON_PACKAGE_CHANGED = 5; // 0x5













    field public static final int REASON_PACKAGE_SUSPENDED = 14; // 0xe













    field public static final int REASON_PROFILE_TURNED_OFF = 15; // 0xf













    field public static final int REASON_SNOOZED = 18; // 0x12













    field public static final int REASON_UNAUTOBUNDLED = 16; // 0x10













    field public static final int REASON_USER_STOPPED = 6; // 0x6













    field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationAssistantService";













  }



























  public abstract class NotificationListenerService extends android.app.Service {















    ctor public NotificationListenerService();















    method public final void cancelAllNotifications();

























api/system-current.txt



+29
−31




























Original line number
Diff line number
Diff line








@@ -41,6 +41,7 @@ package android {













    field public static final java.lang.String BIND_KEYGUARD_APPWIDGET = "android.permission.BIND_KEYGUARD_APPWIDGET";















    field public static final java.lang.String BIND_MIDI_DEVICE_SERVICE = "android.permission.BIND_MIDI_DEVICE_SERVICE";















    field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";













    field public static final java.lang.String BIND_NOTIFICATION_ASSISTANT_SERVICE = "android.permission.BIND_NOTIFICATION_ASSISTANT_SERVICE";















    field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";















    field public static final java.lang.String BIND_PRINT_RECOMMENDATION_SERVICE = "android.permission.BIND_PRINT_RECOMMENDATION_SERVICE";















    field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE";










@@ -37687,6 +37688,34 @@ package android.service.notification {













    field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.ConditionProviderService";















  }



























  public abstract class NotificationAssistantService extends android.service.notification.NotificationListenerService {













    ctor public NotificationAssistantService();













    method public final void adjustNotification(android.service.notification.Adjustment);













    method public final void adjustNotifications(java.util.List<android.service.notification.Adjustment>);













    method public final android.os.IBinder onBind(android.content.Intent);













    method public abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);













    method public void onNotificationRemoved(java.lang.String, long, int);













    field public static final int REASON_APP_CANCEL = 8; // 0x8













    field public static final int REASON_APP_CANCEL_ALL = 9; // 0x9













    field public static final int REASON_CHANNEL_BANNED = 17; // 0x11













    field public static final int REASON_DELEGATE_CANCEL = 2; // 0x2













    field public static final int REASON_DELEGATE_CANCEL_ALL = 3; // 0x3













    field public static final int REASON_DELEGATE_CLICK = 1; // 0x1













    field public static final int REASON_DELEGATE_ERROR = 4; // 0x4













    field public static final int REASON_GROUP_OPTIMIZATION = 13; // 0xd













    field public static final int REASON_GROUP_SUMMARY_CANCELED = 12; // 0xc













    field public static final int REASON_LISTENER_CANCEL = 10; // 0xa













    field public static final int REASON_LISTENER_CANCEL_ALL = 11; // 0xb













    field public static final int REASON_PACKAGE_BANNED = 7; // 0x7













    field public static final int REASON_PACKAGE_CHANGED = 5; // 0x5













    field public static final int REASON_PACKAGE_SUSPENDED = 14; // 0xe













    field public static final int REASON_PROFILE_TURNED_OFF = 15; // 0xf













    field public static final int REASON_SNOOZED = 18; // 0x12













    field public static final int REASON_UNAUTOBUNDLED = 16; // 0x10













    field public static final int REASON_USER_STOPPED = 6; // 0x6













    field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationAssistantService";













  }



























  public abstract class NotificationListenerService extends android.app.Service {















    ctor public NotificationListenerService();















    method public final void cancelAllNotifications();










@@ -37754,37 +37783,6 @@ package android.service.notification {













    field public static final android.os.Parcelable.Creator<android.service.notification.NotificationListenerService.RankingMap> CREATOR;















  }



























  public abstract class NotificationRankerService extends android.service.notification.NotificationListenerService {













    ctor public NotificationRankerService();













    method public final void adjustNotification(android.service.notification.Adjustment);













    method public final void adjustNotifications(java.util.List<android.service.notification.Adjustment>);













    method public final android.os.IBinder onBind(android.content.Intent);













    method public void onNotificationActionClick(java.lang.String, long, int);













    method public void onNotificationClick(java.lang.String, long);













    method public abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);













    method public void onNotificationRemoved(java.lang.String, long, int);













    method public void onNotificationVisibilityChanged(java.lang.String, long, boolean);













    field public static final int REASON_APP_CANCEL = 8; // 0x8













    field public static final int REASON_APP_CANCEL_ALL = 9; // 0x9













    field public static final int REASON_CHANNEL_BANNED = 17; // 0x11













    field public static final int REASON_DELEGATE_CANCEL = 2; // 0x2













    field public static final int REASON_DELEGATE_CANCEL_ALL = 3; // 0x3













    field public static final int REASON_DELEGATE_CLICK = 1; // 0x1













    field public static final int REASON_DELEGATE_ERROR = 4; // 0x4













    field public static final int REASON_GROUP_OPTIMIZATION = 13; // 0xd













    field public static final int REASON_GROUP_SUMMARY_CANCELED = 12; // 0xc













    field public static final int REASON_LISTENER_CANCEL = 10; // 0xa













    field public static final int REASON_LISTENER_CANCEL_ALL = 11; // 0xb













    field public static final int REASON_PACKAGE_BANNED = 7; // 0x7













    field public static final int REASON_PACKAGE_CHANGED = 5; // 0x5













    field public static final int REASON_PACKAGE_SUSPENDED = 14; // 0xe













    field public static final int REASON_PROFILE_TURNED_OFF = 15; // 0xf













    field public static final int REASON_SNOOZED = 18; // 0x12













    field public static final int REASON_UNAUTOBUNDLED = 16; // 0x10













    field public static final int REASON_USER_STOPPED = 6; // 0x6













    field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationRankerService";













  }



























  public class StatusBarNotification implements android.os.Parcelable {















    ctor public StatusBarNotification(java.lang.String, java.lang.String, int, java.lang.String, int, int, int, android.app.Notification, android.os.UserHandle, long);















    ctor public StatusBarNotification(android.os.Parcel);

























api/test-current.txt



+44
−0




























Original line number
Diff line number
Diff line








@@ -28,6 +28,7 @@ package android {













    field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD";















    field public static final java.lang.String BIND_MIDI_DEVICE_SERVICE = "android.permission.BIND_MIDI_DEVICE_SERVICE";















    field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";













    field public static final java.lang.String BIND_NOTIFICATION_ASSISTANT_SERVICE = "android.permission.BIND_NOTIFICATION_ASSISTANT_SERVICE";















    field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";















    field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE";















    field public static final java.lang.String BIND_QUICK_SETTINGS_TILE = "android.permission.BIND_QUICK_SETTINGS_TILE";










@@ -34923,6 +34924,21 @@ package android.service.media {



























package android.service.notification {



























  public final class Adjustment implements android.os.Parcelable {













    ctor public Adjustment(java.lang.String, java.lang.String, int, android.os.Bundle, java.lang.CharSequence, android.net.Uri, int);













    ctor protected Adjustment(android.os.Parcel);













    method public int describeContents();













    method public java.lang.CharSequence getExplanation();













    method public int getImportance();













    method public java.lang.String getKey();













    method public java.lang.String getPackage();













    method public android.net.Uri getReference();













    method public android.os.Bundle getSignals();













    method public int getUser();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.service.notification.Adjustment> CREATOR;













  }



























  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);










@@ -34969,6 +34985,34 @@ package android.service.notification {













    field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.ConditionProviderService";















  }



























  public abstract class NotificationAssistantService extends android.service.notification.NotificationListenerService {













    ctor public NotificationAssistantService();













    method public final void adjustNotification(android.service.notification.Adjustment);













    method public final void adjustNotifications(java.util.List<android.service.notification.Adjustment>);













    method public final android.os.IBinder onBind(android.content.Intent);













    method public abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);













    method public void onNotificationRemoved(java.lang.String, long, int);













    field public static final int REASON_APP_CANCEL = 8; // 0x8













    field public static final int REASON_APP_CANCEL_ALL = 9; // 0x9













    field public static final int REASON_CHANNEL_BANNED = 17; // 0x11













    field public static final int REASON_DELEGATE_CANCEL = 2; // 0x2













    field public static final int REASON_DELEGATE_CANCEL_ALL = 3; // 0x3













    field public static final int REASON_DELEGATE_CLICK = 1; // 0x1













    field public static final int REASON_DELEGATE_ERROR = 4; // 0x4













    field public static final int REASON_GROUP_OPTIMIZATION = 13; // 0xd













    field public static final int REASON_GROUP_SUMMARY_CANCELED = 12; // 0xc













    field public static final int REASON_LISTENER_CANCEL = 10; // 0xa













    field public static final int REASON_LISTENER_CANCEL_ALL = 11; // 0xb













    field public static final int REASON_PACKAGE_BANNED = 7; // 0x7













    field public static final int REASON_PACKAGE_CHANGED = 5; // 0x5













    field public static final int REASON_PACKAGE_SUSPENDED = 14; // 0xe













    field public static final int REASON_PROFILE_TURNED_OFF = 15; // 0xf













    field public static final int REASON_SNOOZED = 18; // 0x12













    field public static final int REASON_UNAUTOBUNDLED = 16; // 0x10













    field public static final int REASON_USER_STOPPED = 6; // 0x6













    field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationAssistantService";













  }



























  public abstract class NotificationListenerService extends android.app.Service {















    ctor public NotificationListenerService();















    method public final void cancelAllNotifications();

























compiled-classes-phone



+3
−3




























Original line number
Diff line number
Diff line








@@ -3610,9 +3610,9 @@ android.service.notification.NotificationListenerService$NotificationListenerWra













android.service.notification.NotificationListenerService$Ranking















android.service.notification.NotificationListenerService$RankingMap















android.service.notification.NotificationListenerService$RankingMap$1













android.service.notification.NotificationRankerService













android.service.notification.NotificationRankerService$MyHandler













android.service.notification.NotificationRankerService$NotificationRankingServiceWrapper













android.service.notification.NotificationAssistantService













android.service.notification.NotificationAssistantService$MyHandler













android.service.notification.NotificationAssistantService$NotificationRankingServiceWrapper















android.service.notification.NotificationRankingUpdate















android.service.notification.NotificationRankingUpdate$1















android.service.notification.StatusBarNotification

































core/java/android/app/INotificationManager.aidl



+2
−2




























Original line number
Diff line number
Diff line








@@ -94,8 +94,8 @@ interface INotificationManager













    void setOnNotificationPostedTrimFromListener(in INotificationListener token, int trim);















    void setInterruptionFilter(String pkg, int interruptionFilter);





























    void applyAdjustmentFromRankerService(in INotificationListener token, in Adjustment adjustment);













    void applyAdjustmentsFromRankerService(in INotificationListener token, in List<Adjustment> adjustments);













    void applyAdjustmentFromAssistantService(in INotificationListener token, in Adjustment adjustment);













    void applyAdjustmentsFromAssistantService(in INotificationListener token, in List<Adjustment> adjustments);































    ComponentName getEffectsSuppressor();















    boolean matchesCallFilter(in Bundle extras);