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

Commit ca813225 authored by Matías Hernández's avatar Matías Hernández Committed by Automerger Merge Worker
Browse files

Merge "Delete updateNotificationChannelGroupFromPrivilegedListener" into... 

Merge "Delete updateNotificationChannelGroupFromPrivilegedListener" into tm-dev am: effbf6df am: d741cd6c am: 53fc5b1d am: eab68f80

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



Change-Id: I270d499f110c77e62df61ae5ab9d6650a68e37bd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2e795e10 eab68f80

core/java/android/app/INotificationManager.aidl

+0 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ interface INotificationManager 
    void setOnNotificationPostedTrimFromListener(in INotificationListener token, int trim);

    void setInterruptionFilter(String pkg, int interruptionFilter);



    void updateNotificationChannelGroupFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user, in NotificationChannelGroup group);

    void updateNotificationChannelFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user, in NotificationChannel channel);

    ParceledListSlice getNotificationChannelsFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user);

    ParceledListSlice getNotificationChannelGroupsFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user);

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

+0 −11
Original line number Diff line number Diff line
@@ -5754,17 +5754,6 @@ public class NotificationManagerService extends SystemService { 
            }

        }













        @Override













        public void updateNotificationChannelGroupFromPrivilegedListener(













                INotificationListener token, String pkg, UserHandle user,













                NotificationChannelGroup group) throws RemoteException {













            Objects.requireNonNull(user);













            verifyPrivilegedListener(token, user, false);













            createNotificationChannelGroup(













                    pkg, getUidForPackageAndUser(pkg, user), group, false, true);













            handleSavePolicyFile();













        }



























        @Override















        public void updateNotificationChannelFromPrivilegedListener(INotificationListener token,















                String pkg, UserHandle user, NotificationChannel channel) throws RemoteException {