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

Commit 901bf28b authored by Julia Reynolds's avatar Julia Reynolds
Browse files

The quietening part 2: rules 

Apply some rules about what notifications are automatically
silenced.

Test: make ExtServicesUnitTests &&
adb install -r $OUT/testcases/ExtServicesUnitTests/ExtServicesUnitTests.apk &&
adb shell am instrument -w android.ext.services.tests.unit/android.support.test.runner.AndroidJUnitRunner
Bug: 111475013

Change-Id: Idf0434c0688b3249a9fc2d5aa655665e71e53249
parent 43b08a27

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -4720,7 +4720,8 @@ package android.service.notification { 
    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);

    method public android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification);

    method public android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, android.app.NotificationChannel);

    method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap, android.service.notification.NotificationStats, int);

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

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

api/test-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -1064,7 +1064,8 @@ package android.service.notification { 
    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);

    method public android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification);

    method public android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, android.app.NotificationChannel);

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

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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -43,6 +43,6 @@ oneway interface INotificationListener 
    void onNotificationChannelGroupModification(String pkgName, in UserHandle user, in NotificationChannelGroup group, int modificationType);



    // assistants only

    void onNotificationEnqueued(in IStatusBarNotificationHolder notificationHolder);

    void onNotificationEnqueuedWithChannel(in IStatusBarNotificationHolder notificationHolder, in NotificationChannel channel);

    void onNotificationSnoozedUntilContext(in IStatusBarNotificationHolder notificationHolder, String snoozeCriterionId);

}

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

+23 −5
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.service.notification; 
import android.annotation.SdkConstant;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.app.NotificationChannel;

import android.app.admin.DevicePolicyManager;

import android.content.ComponentName;

import android.content.Context;
@@ -102,7 +103,22 @@ public abstract class NotificationAssistantService extends NotificationListenerS 
     * @param sbn the new notification

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

     */

    abstract public Adjustment onNotificationEnqueued(StatusBarNotification sbn);

    public Adjustment onNotificationEnqueued(StatusBarNotification sbn) {

        return null;

    }



    /**

     * A notification was posted by an app. Called before post.

     *

     * @param sbn the new notification

     * @param channel the channel the notification was posted to

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

     */

    public Adjustment onNotificationEnqueued(StatusBarNotification sbn,

            NotificationChannel channel) {

        return onNotificationEnqueued(sbn);

    }





    /**

     * Implement this method to learn when notifications are removed, how they were interacted with
@@ -186,7 +202,8 @@ public abstract class NotificationAssistantService extends NotificationListenerS 


    private class NotificationAssistantServiceWrapper extends NotificationListenerWrapper {

        @Override

        public void onNotificationEnqueued(IStatusBarNotificationHolder sbnHolder) {

        public void onNotificationEnqueuedWithChannel(IStatusBarNotificationHolder sbnHolder,

                NotificationChannel channel) {

            StatusBarNotification sbn;

            try {

                sbn = sbnHolder.get();
@@ -197,14 +214,14 @@ public abstract class NotificationAssistantService extends NotificationListenerS 


            SomeArgs args = SomeArgs.obtain();

            args.arg1 = sbn;

            args.arg2 = channel;

            mHandler.obtainMessage(MyHandler.MSG_ON_NOTIFICATION_ENQUEUED,

                    args).sendToTarget();

        }



        @Override

        public void onNotificationSnoozedUntilContext(

                IStatusBarNotificationHolder sbnHolder, String snoozeCriterionId)

                throws RemoteException {

                IStatusBarNotificationHolder sbnHolder, String snoozeCriterionId) {

            StatusBarNotification sbn;

            try {

                sbn = sbnHolder.get();
@@ -235,8 +252,9 @@ public abstract class NotificationAssistantService extends NotificationListenerS 
                case MSG_ON_NOTIFICATION_ENQUEUED: {

                    SomeArgs args = (SomeArgs) msg.obj;

                    StatusBarNotification sbn = (StatusBarNotification) args.arg1;

                    NotificationChannel channel = (NotificationChannel) args.arg2;

                    args.recycle();

                    Adjustment adjustment = onNotificationEnqueued(sbn);

                    Adjustment adjustment = onNotificationEnqueued(sbn, channel);

                    if (adjustment != null) {

                        if (!isBound()) return;

                        try {

core/java/android/service/notification/NotificationListenerService.java

+2 −1
Original line number Diff line number Diff line
@@ -1318,7 +1318,8 @@ public abstract class NotificationListenerService extends Service { 
        }



        @Override

        public void onNotificationEnqueued(IStatusBarNotificationHolder notificationHolder)

        public void onNotificationEnqueuedWithChannel(

                IStatusBarNotificationHolder notificationHolder, NotificationChannel channel)

                throws RemoteException {

            // no-op in the listener

        }