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

Commit 63f4e4fd authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Add implicit grants to NLSes"

parents ca86a97f 534e6d5f

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

+9 −4
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ public class NotificationManagerService extends SystemService { 
    private ActivityManagerInternal mAmi;

    private IPackageManager mPackageManager;

    private PackageManager mPackageManagerClient;

    private PackageManagerInternal mPackageManagerInternal;

    PackageManagerInternal mPackageManagerInternal;

    private PermissionPolicyInternal mPermissionPolicyInternal;

    AudioManager mAudioManager;

    AudioManagerInternal mAudioManagerInternal;
@@ -9779,7 +9779,7 @@ public class NotificationManagerService extends SystemService { 
     * notifications visible to the given listener.

     */

    @GuardedBy("mNotificationLock")

    private NotificationRankingUpdate makeRankingUpdateLocked(ManagedServiceInfo info) {

    NotificationRankingUpdate makeRankingUpdateLocked(ManagedServiceInfo info) {

        final int N = mNotificationList.size();

        final ArrayList<NotificationListenerService.Ranking> rankings = new ArrayList<>();










@@ -10924,12 +10924,17 @@ public class NotificationManagerService extends SystemService {













                                info, oldSbnLightClone, update, null, REASON_USER_STOPPED));















                        continue;















                    }



























                    // Grant access before listener is notified















                    final int targetUserId = (info.userid == UserHandle.USER_ALL)















                            ? UserHandle.USER_SYSTEM : info.userid;















                    updateUriPermissions(r, old, info.component.getPackageName(), targetUserId);



























                    mPackageManagerInternal.grantImplicitAccess(













                            targetUserId, null /* intent */,













                            UserHandle.getAppId(info.uid),













                            sbn.getUid(),













                            false /* direct */, false /* retainOnUpdate */);



























                    final StatusBarNotification sbnToPost = trimCache.ForListener(info);















                    mHandler.post(() -> notifyPosted(info, sbnToPost, update));















                }

































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



+40
−0




























Original line number
Diff line number
Diff line








@@ -28,6 +28,7 @@ import static junit.framework.Assert.assertFalse;













import static junit.framework.Assert.assertTrue;































import static org.mockito.ArgumentMatchers.any;













import static org.mockito.ArgumentMatchers.anyInt;















import static org.mockito.ArgumentMatchers.eq;















import static org.mockito.ArgumentMatchers.nullable;















import static org.mockito.Mockito.atLeast;









@@ -40,16 +41,23 @@ import static org.mockito.Mockito.verify;













import static org.mockito.Mockito.when;































import android.app.INotificationManager;













import android.app.Notification;













import android.app.NotificationChannel;













import android.app.NotificationManager;















import android.content.ComponentName;













import android.content.Context;















import android.content.pm.IPackageManager;















import android.content.pm.PackageManager;















import android.content.pm.ServiceInfo;















import android.content.pm.VersionedPackage;















import android.os.Bundle;













import android.os.IBinder;













import android.os.IInterface;















import android.os.UserHandle;















import android.service.notification.NotificationListenerFilter;















import android.service.notification.NotificationListenerService;















import android.service.notification.NotificationStats;













import android.service.notification.NotificationRankingUpdate;















import android.service.notification.StatusBarNotification;















import android.testing.TestableContext;















import android.util.ArraySet;









@@ -60,6 +68,8 @@ import android.util.Xml;





























import com.android.server.UiServiceTestCase;





























import com.google.common.collect.ImmutableList;





























import org.junit.Before;















import org.junit.Test;















import org.mockito.Mock;










@@ -457,4 +467,34 @@ public class NotificationListenersTest extends UiServiceTestCase {













        mListeners.notifyRemovedLocked(r, 0, rs);















        verify(r, never()).getSbn();















    }



























    @Test













    public void testImplicitGrant() {













        String pkg = "pkg";













        int uid = 9;













        NotificationChannel channel = new NotificationChannel("id", "name",













                NotificationManager.IMPORTANCE_HIGH);













        Notification.Builder nb = new Notification.Builder(mContext, channel.getId())













                .setContentTitle("foo")













                .setSmallIcon(android.R.drawable.sym_def_app_icon)













                .setTimeoutAfter(1);



























        StatusBarNotification sbn = new StatusBarNotification(pkg, pkg, 8, "tag", uid, 0,













                nb.build(), UserHandle.getUserHandleForUid(uid), null, 0);













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



























        ManagedServices.ManagedServiceInfo info = mListeners.new ManagedServiceInfo(













                null, new ComponentName("a", "a"), sbn.getUserId(), false, null, 33, 33);













        List<ManagedServices.ManagedServiceInfo> services = ImmutableList.of(info);













        when(mListeners.getServices()).thenReturn(services);



























        when(mNm.isVisibleToListener(any(), anyInt(), any())).thenReturn(true);













        when(mNm.makeRankingUpdateLocked(info)).thenReturn(mock(NotificationRankingUpdate.class));













        mNm.mPackageManagerInternal = mPmi;



























        mListeners.notifyPostedLocked(r, null);



























        verify(mPmi).grantImplicitAccess(sbn.getUserId(), null, UserHandle.getAppId(33),













                sbn.getUid(), false, false);













    }















}