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

Commit e5aa169d authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Check group channels for FGSes" into sc-dev am: 90c72d1e 

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

Change-Id: Id803d92b5f83b906e35ec2cacea327708265924c
parents fc7f8f7e 90c72d1e

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

+3 −2
Original line number Diff line number Diff line
@@ -2803,7 +2803,7 @@ public class NotificationManagerService extends SystemService { 
        }

    }



    private void createNotificationChannelGroup(String pkg, int uid, NotificationChannelGroup group,

    void createNotificationChannelGroup(String pkg, int uid, NotificationChannelGroup group,

            boolean fromApp, boolean fromListener) {

        Objects.requireNonNull(group);

        Objects.requireNonNull(pkg);
@@ -3851,7 +3851,8 @@ public class NotificationManagerService extends SystemService { 


            final int callingUid = Binder.getCallingUid();

            NotificationChannelGroup groupToDelete =

                    mPreferencesHelper.getNotificationChannelGroup(groupId, pkg, callingUid);

                    mPreferencesHelper.getNotificationChannelGroupWithChannels(

                            pkg, callingUid, groupId, false);

            if (groupToDelete != null) {

                // Preflight for allowability

                final int userId = UserHandle.getUserId(callingUid);

services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java

+54 −1
Original line number Diff line number Diff line
@@ -225,6 +225,8 @@ import java.util.Arrays; 
import java.util.Collections;

import java.util.List;

import java.util.Map;

import java.util.Set;

import java.util.concurrent.CountDownLatch;

import java.util.function.Consumer;
@@ -2460,7 +2462,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
                .thenReturn(associations);

        NotificationChannelGroup ncg = new NotificationChannelGroup("a", "b/c");

        mService.setPreferencesHelper(mPreferencesHelper);

        when(mPreferencesHelper.getNotificationChannelGroup(eq(ncg.getId()), eq(PKG), anyInt()))

        when(mPreferencesHelper.getNotificationChannelGroupWithChannels(

                eq(PKG), anyInt(), eq(ncg.getId()), anyBoolean()))

                .thenReturn(ncg);

        reset(mListeners);

        mBinderService.deleteNotificationChannelGroup(PKG, ncg.getId());
@@ -2469,6 +2472,56 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
                eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_DELETED));

    }



    @Test

    public void testDeleteChannelGroupChecksForFgses() throws Exception {

        List<String> associations = new ArrayList<>();

        associations.add("a");

        when(mCompanionMgr.getAssociations(PKG, UserHandle.getUserId(mUid)))

                .thenReturn(associations);

        CountDownLatch latch = new CountDownLatch(2);

        mService.createNotificationChannelGroup(

                PKG, mUid, new NotificationChannelGroup("group", "group"), true, false);

        new Thread(() -> {

            NotificationChannel notificationChannel = new NotificationChannel("id", "id",

                    NotificationManager.IMPORTANCE_HIGH);

            notificationChannel.setGroup("group");

            ParceledListSlice<NotificationChannel> pls =

                    new ParceledListSlice(ImmutableList.of(notificationChannel));

            try {

                mBinderService.createNotificationChannelsForPackage(PKG, mUid, pls);

            } catch (RemoteException e) {

                throw new RuntimeException(e);

            }

            latch.countDown();

        }).start();

        new Thread(() -> {

            try {

                synchronized (this) {

                    wait(5000);

                }

                mService.createNotificationChannelGroup(PKG, mUid,

                        new NotificationChannelGroup("new", "new group"), true, false);

                NotificationChannel notificationChannel =

                        new NotificationChannel("id", "id", NotificationManager.IMPORTANCE_HIGH);

                notificationChannel.setGroup("new");

                ParceledListSlice<NotificationChannel> pls =

                        new ParceledListSlice(ImmutableList.of(notificationChannel));

                try {

                mBinderService.createNotificationChannelsForPackage(PKG, mUid, pls);

                mBinderService.deleteNotificationChannelGroup(PKG, "group");

                } catch (RemoteException e) {

                    throw new RuntimeException(e);

                }

            } catch (Exception e) {

                e.printStackTrace();

            }

            latch.countDown();

        }).start();



        latch.await();

        verify(mAmi).hasForegroundServiceNotification(anyString(), anyInt(), anyString());

    }



    @Test

    public void testUpdateNotificationChannelFromPrivilegedListener_success() throws Exception {

        mService.setPreferencesHelper(mPreferencesHelper);