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

Commit 29315b57 authored by Julia Reynolds's avatar Julia Reynolds Committed by Greg Wroblewski
Browse files

Add cross user permission check - areNotificationsEnabledForPackage 

Test: atest
Fixes: 128599467
Change-Id: I13a0ca7590f8c4b44379730e0ee2088aba400c2a
Merged-In: I13a0ca7590f8c4b44379730e0ee2088aba400c2a
(cherry picked from commit 657d1641)
(cherry picked from commit 63846a70)
parent fcbaf8a5

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

+5 −0
Original line number Diff line number Diff line
@@ -2168,6 +2168,11 @@ public class NotificationManagerService extends SystemService { 
        @Override

        public boolean areNotificationsEnabledForPackage(String pkg, int uid) {

            checkCallerIsSystemOrSameApp(pkg);

            if (UserHandle.getCallingUserId() != UserHandle.getUserId(uid)) {

                getContext().enforceCallingPermission(

                        android.Manifest.permission.INTERACT_ACROSS_USERS,

                        "canNotifyAsPackage for uid " + uid);

            }



            return mRankingHelper.getImportance(pkg, uid) != IMPORTANCE_NONE;

        }

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

+61 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON 
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR;

import static android.content.pm.PackageManager.FEATURE_WATCH;

import static android.content.pm.PackageManager.PERMISSION_DENIED;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.os.Build.VERSION_CODES.O_MR1;

import static android.os.Build.VERSION_CODES.P;
@@ -106,6 +107,7 @@ import android.testing.AndroidTestingRunner; 
import android.testing.TestableContext;

import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;

import android.testing.TestablePermissions;

import android.text.Html;

import android.util.ArrayMap;

import android.util.AtomicFile;
@@ -3088,4 +3090,63 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        verify(mAppUsageStats, times(1)).reportInterruptiveNotification(

                anyString(), anyString(), anyInt());

    }



    @Test

    public void testRemoveForegroundServiceFlagFromNotification_enqueued() {

        Notification n = new Notification.Builder(mContext, "").build();

        n.flags |= FLAG_FOREGROUND_SERVICE;



        StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 9, null, mUid, 0,

                n, new UserHandle(mUid), null, 0);

        NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel);



        mService.addEnqueuedNotification(r);



        mInternalService.removeForegroundServiceFlagFromNotification(

                PKG, r.sbn.getId(), r.sbn.getUserId());



        waitForIdle();



        verify(mListeners, timeout(200).times(0)).notifyPostedLocked(any(), any());

    }



    @Test

    public void testRemoveForegroundServiceFlagFromNotification_posted() {

        Notification n = new Notification.Builder(mContext, "").build();

        n.flags |= FLAG_FOREGROUND_SERVICE;



        StatusBarNotification sbn = new StatusBarNotification(PKG, PKG, 9, null, mUid, 0,

                n, new UserHandle(mUid), null, 0);

        NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel);



        mService.addNotification(r);



        mInternalService.removeForegroundServiceFlagFromNotification(

                PKG, r.sbn.getId(), r.sbn.getUserId());



        waitForIdle();



        ArgumentCaptor<NotificationRecord> captor =

                ArgumentCaptor.forClass(NotificationRecord.class);

        verify(mListeners, times(1)).notifyPostedLocked(captor.capture(), any());



        assertEquals(0, captor.getValue().getNotification().flags);

    }



    @Test

    public void testAreNotificationsEnabledForPackage_crossUser() throws Exception {

        try {

            mBinderService.areNotificationsEnabledForPackage(mContext.getPackageName(),

                    mUid + UserHandle.PER_USER_RANGE);

            fail("Cannot call cross user without permission");

        } catch (SecurityException e) {

            // pass

        }



        // cross user, with permission, no problem

        TestablePermissions perms = mContext.getTestablePermissions();

        perms.setPermission(android.Manifest.permission.INTERACT_ACROSS_USERS, PERMISSION_GRANTED);

        mBinderService.areNotificationsEnabledForPackage(mContext.getPackageName(),

                mUid + UserHandle.PER_USER_RANGE);

    }

}