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

Commit 380befbb authored by Nate Myren's avatar Nate Myren Committed by Android (Google) Code Review
Browse files

Merge "Revert "Ensure GRANTED_BY_DEFAULT properly cleared in NMS"" into main

parents 44f8fc44 d9230f93

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

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.server.notification;



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

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

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

import static android.content.pm.PackageManager.GET_PERMISSIONS;
@@ -203,7 +202,6 @@ public final class PermissionHelper { 
                        Context.DEVICE_ID_DEFAULT, userId, TAG);

            }

            int flagMask = FLAG_PERMISSION_USER_SET | FLAG_PERMISSION_USER_FIXED;

            flagMask = userSet || !grant ? flagMask | FLAG_PERMISSION_GRANTED_BY_DEFAULT : flagMask;

            if (userSet) {

                mPermManager.updatePermissionFlags(packageName, NOTIFICATION_PERMISSION, flagMask,

                        FLAG_PERMISSION_USER_SET, true, Context.DEVICE_ID_DEFAULT, userId);

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

+4 −8
Original line number Diff line number Diff line
@@ -248,8 +248,7 @@ public class PermissionHelperTest extends UiServiceTestCase { 
        verify(mPermManager).grantRuntimePermission(

                "pkg", Manifest.permission.POST_NOTIFICATIONS, Context.DEVICE_ID_DEFAULT, 10);

        verify(mPermManager).updatePermissionFlags("pkg", Manifest.permission.POST_NOTIFICATIONS,

                USER_FLAG_MASK | FLAG_PERMISSION_GRANTED_BY_DEFAULT,

                FLAG_PERMISSION_USER_SET, true, Context.DEVICE_ID_DEFAULT, 10);

                USER_FLAG_MASK, FLAG_PERMISSION_USER_SET, true, Context.DEVICE_ID_DEFAULT, 10);

    }



    @Test
@@ -267,8 +266,7 @@ public class PermissionHelperTest extends UiServiceTestCase { 
        verify(mPermManager).grantRuntimePermission(

                "pkg", Manifest.permission.POST_NOTIFICATIONS, Context.DEVICE_ID_DEFAULT, 10);

        verify(mPermManager).updatePermissionFlags("pkg", Manifest.permission.POST_NOTIFICATIONS,

                USER_FLAG_MASK | FLAG_PERMISSION_GRANTED_BY_DEFAULT,

                FLAG_PERMISSION_USER_SET, true, Context.DEVICE_ID_DEFAULT, 10);

                USER_FLAG_MASK, FLAG_PERMISSION_USER_SET, true, Context.DEVICE_ID_DEFAULT, 10);

    }



    @Test
@@ -282,8 +280,7 @@ public class PermissionHelperTest extends UiServiceTestCase { 
                eq("pkg"), eq(Manifest.permission.POST_NOTIFICATIONS),

                eq(Context.DEVICE_ID_DEFAULT), eq(10), anyString());

        verify(mPermManager).updatePermissionFlags("pkg", Manifest.permission.POST_NOTIFICATIONS,

                USER_FLAG_MASK | FLAG_PERMISSION_GRANTED_BY_DEFAULT,

                FLAG_PERMISSION_USER_SET, true, Context.DEVICE_ID_DEFAULT, 10);

                USER_FLAG_MASK, FLAG_PERMISSION_USER_SET, true, Context.DEVICE_ID_DEFAULT, 10);

    }



    @Test
@@ -310,8 +307,7 @@ public class PermissionHelperTest extends UiServiceTestCase { 
                eq("pkg"), eq(Manifest.permission.POST_NOTIFICATIONS),

                eq(Context.DEVICE_ID_DEFAULT), eq(10), anyString());

        verify(mPermManager).updatePermissionFlags("pkg", Manifest.permission.POST_NOTIFICATIONS,

                USER_FLAG_MASK | FLAG_PERMISSION_GRANTED_BY_DEFAULT, 0,

                true, Context.DEVICE_ID_DEFAULT, 10);

                USER_FLAG_MASK, 0, true, Context.DEVICE_ID_DEFAULT, 10);

    }



    @Test