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

Commit e8639661 authored by Danning Chen's avatar Danning Chen Committed by Automerger Merge Worker
Browse files

Merge "Expose onNotificationChannelModified() callback to... 

Merge "Expose onNotificationChannelModified() callback to NotificationAssistantService" into sc-dev am: 8bdb6c35

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519285

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b412658abea3e89c80c254b72c6251a7322030b
parents 0c31949a 8bdb6c35

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

                    }