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

Commit 8bdb6c35 authored by Danning Chen's avatar Danning Chen Committed by Android (Google) Code Review
Browse files

Merge "Expose onNotificationChannelModified() callback to NotificationAssistantService" into sc-dev

parents 94d2b53e c25977ad

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

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ oneway interface INotificationListener 
    void onListenerHintsChanged(int hints);

    void onInterruptionFilterChanged(int interruptionFilter);



    // companion device managers only

    // companion device managers and assistants only

    void onNotificationChannelModification(String pkgName, in UserHandle user, in NotificationChannel channel, int modificationType);

    void onNotificationChannelGroupModification(String pkgName, in UserHandle user, in NotificationChannelGroup group, int modificationType);

services/core/java/com/android/server/notification/NotificationManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -10104,7 +10104,9 @@ public class NotificationManagerService extends SystemService { 
                }



                BackgroundThread.getHandler().post(() -> {

                    if (info.isSystem || hasCompanionDevice(info)) {

                    if (info.isSystem

                            || hasCompanionDevice(info)

                            || mAssistants.isServiceTokenValidLocked(info.service)) {

                        notifyNotificationChannelChanged(

                                info, pkg, user, channel, modificationType);

                    }