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

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

Merge "Remove unneeded parameters"

parents 8178ba08 ceecfcf5

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -36128,7 +36128,7 @@ package android.service.notification { 
    method public void deleteNotificationChannel(java.lang.String, java.lang.String);

    method public java.util.List<android.app.NotificationChannel> getNotificationChannels(java.lang.String);

    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 abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification);

    method public abstract void onNotificationSnoozedUntilContext(android.service.notification.StatusBarNotification, java.lang.String);

    method public final void unsnoozeNotification(java.lang.String);

    method public void updateNotificationChannel(java.lang.String, android.app.NotificationChannel);

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -39157,7 +39157,7 @@ package android.service.notification { 
    method public void deleteNotificationChannel(java.lang.String, java.lang.String);

    method public java.util.List<android.app.NotificationChannel> getNotificationChannels(java.lang.String);

    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 abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification);

    method public abstract void onNotificationSnoozedUntilContext(android.service.notification.StatusBarNotification, java.lang.String);

    method public final void unsnoozeNotification(java.lang.String);

    method public void updateNotificationChannel(java.lang.String, android.app.NotificationChannel);

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -36263,7 +36263,7 @@ package android.service.notification { 
    method public void deleteNotificationChannel(java.lang.String, java.lang.String);

    method public java.util.List<android.app.NotificationChannel> getNotificationChannels(java.lang.String);

    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 abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification);

    method public abstract void onNotificationSnoozedUntilContext(android.service.notification.StatusBarNotification, java.lang.String);

    method public final void unsnoozeNotification(java.lang.String);

    method public void updateNotificationChannel(java.lang.String, android.app.NotificationChannel);

core/java/android/service/notification/INotificationListener.aidl

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,6 @@ oneway interface INotificationListener 
    void onInterruptionFilterChanged(int interruptionFilter);



    // rankers only

    void onNotificationEnqueued(in IStatusBarNotificationHolder notificationHolder, int importance, boolean user);

    void onNotificationEnqueued(in IStatusBarNotificationHolder notificationHolder);

    void onNotificationSnoozedUntilContext(in IStatusBarNotificationHolder notificationHolder, String snoozeCriterionId);

}

core/java/android/service/notification/NotificationAssistantService.java

+3 −11
Original line number Diff line number Diff line
@@ -77,12 +77,9 @@ public abstract class NotificationAssistantService extends NotificationListenerS 
     * A notification was posted by an app. Called before alert.

     *

     * @param sbn the new notification

     * @param importance the initial importance of the notification.

     * @param user true if the initial importance reflects an explicit user preference.

     * @return an adjustment or null to take no action, within 100ms.

     */

    abstract public Adjustment onNotificationEnqueued(StatusBarNotification sbn,

          int importance, boolean user);

    abstract public Adjustment onNotificationEnqueued(StatusBarNotification sbn);



    /**

     * Updates a notification.  N.B. this won’t cause
@@ -202,8 +199,7 @@ public abstract class NotificationAssistantService extends NotificationListenerS 


    private class NotificationAssistantServiceWrapper extends NotificationListenerWrapper {

        @Override

        public void onNotificationEnqueued(IStatusBarNotificationHolder sbnHolder,

                int importance, boolean user) {

        public void onNotificationEnqueued(IStatusBarNotificationHolder sbnHolder) {

            StatusBarNotification sbn;

            try {

                sbn = sbnHolder.get();
@@ -214,8 +210,6 @@ public abstract class NotificationAssistantService extends NotificationListenerS 


            SomeArgs args = SomeArgs.obtain();

            args.arg1 = sbn;

            args.argi1 = importance;

            args.argi2 = user ? 1 : 0;

            mHandler.obtainMessage(MyHandler.MSG_ON_NOTIFICATION_ENQUEUED,

                    args).sendToTarget();

        }
@@ -254,10 +248,8 @@ public abstract class NotificationAssistantService extends NotificationListenerS 
                case MSG_ON_NOTIFICATION_ENQUEUED: {

                    SomeArgs args = (SomeArgs) msg.obj;

                    StatusBarNotification sbn = (StatusBarNotification) args.arg1;

                    final int importance = args.argi1;

                    final boolean user = args.argi2 == 1;

                    args.recycle();

                    Adjustment adjustment = onNotificationEnqueued(sbn, importance, user);

                    Adjustment adjustment = onNotificationEnqueued(sbn);

                    if (adjustment != null) {

                        if (!isBound()) return;

                        try {