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

Commit f3742929 authored by Nate Myren's avatar Nate Myren
Browse files

Remove REVIEW_REQUIRED temporary grant for notifications 

Bug: 231715786
Test: atest PermissionHelperTest, NotificationPermissionsTest
Change-Id: I342a5e78e8c33250f632ce802dd897a1380c4679
Merged-In: I342a5e78e8c33250f632ce802dd897a1380c4679
parent eccd6122

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

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




package com.android.server.notification;

package com.android.server.notification;





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

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

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

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

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

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

import static android.content.pm.PackageManager.PERMISSION_GRANTED;
@@ -70,8 +69,7 @@ public final class PermissionHelper { 
    public boolean hasPermission(int uid) {

    public boolean hasPermission(int uid) {

        final long callingId = Binder.clearCallingIdentity();

        final long callingId = Binder.clearCallingIdentity();

        try {

        try {

            return mPmi.checkPostNotificationsPermissionGrantedOrLegacyAccess(uid)

            return mPmi.checkUidPermission(uid, NOTIFICATION_PERMISSION) == PERMISSION_GRANTED;

                    == PERMISSION_GRANTED;

        } finally {

        } finally {

            Binder.restoreCallingIdentity(callingId);

            Binder.restoreCallingIdentity(callingId);

        }

        }
@@ -150,14 +148,6 @@ public final class PermissionHelper { 
        return notifPermissions;

        return notifPermissions;

    }

    }





    /**

     * @see setNotificationPermission(String, int, boolean, boolean, boolean)

     */

    public void setNotificationPermission(String packageName, @UserIdInt int userId, boolean grant,

            boolean userSet) {

        setNotificationPermission(packageName, userId, grant, userSet, false);

    }



    /**

    /**

     * Grants or revokes the notification permission for a given package/user. UserSet should

     * Grants or revokes the notification permission for a given package/user. UserSet should

     * only be true if this method is being called to migrate existing user choice, because it

     * only be true if this method is being called to migrate existing user choice, because it
@@ -165,7 +155,7 @@ public final class PermissionHelper { 
     * with a lock held.

     * with a lock held.

     */

     */

    public void setNotificationPermission(String packageName, @UserIdInt int userId, boolean grant,

    public void setNotificationPermission(String packageName, @UserIdInt int userId, boolean grant,

            boolean userSet, boolean reviewRequired) {

            boolean userSet) {

        final long callingId = Binder.clearCallingIdentity();

        final long callingId = Binder.clearCallingIdentity();

        try {

        try {

            // Do not change the permission if the package doesn't request it, do not change fixed

            // Do not change the permission if the package doesn't request it, do not change fixed
@@ -179,7 +169,7 @@ public final class PermissionHelper { 




            boolean currentlyGranted = mPmi.checkPermission(packageName, NOTIFICATION_PERMISSION,

            boolean currentlyGranted = mPmi.checkPermission(packageName, NOTIFICATION_PERMISSION,

                    userId) != PackageManager.PERMISSION_DENIED;

                    userId) != PackageManager.PERMISSION_DENIED;

            if (grant && !reviewRequired && !currentlyGranted) {

            if (grant && !currentlyGranted) {

                mPermManager.grantRuntimePermission(packageName, NOTIFICATION_PERMISSION, userId);

                mPermManager.grantRuntimePermission(packageName, NOTIFICATION_PERMISSION, userId);

            } else if (!grant && currentlyGranted) {

            } else if (!grant && currentlyGranted) {

                mPermManager.revokeRuntimePermission(packageName, NOTIFICATION_PERMISSION,

                mPermManager.revokeRuntimePermission(packageName, NOTIFICATION_PERMISSION,
@@ -187,12 +177,10 @@ public final class PermissionHelper { 
            }

            }

            if (userSet) {

            if (userSet) {

                mPermManager.updatePermissionFlags(packageName, NOTIFICATION_PERMISSION,

                mPermManager.updatePermissionFlags(packageName, NOTIFICATION_PERMISSION,

                        FLAG_PERMISSION_USER_SET | FLAG_PERMISSION_REVIEW_REQUIRED,

                        FLAG_PERMISSION_USER_SET, FLAG_PERMISSION_USER_SET, true, userId);

                        FLAG_PERMISSION_USER_SET, true, userId);

            } else {

            } else if (reviewRequired) {

                mPermManager.updatePermissionFlags(packageName, NOTIFICATION_PERMISSION,

                mPermManager.updatePermissionFlags(packageName, NOTIFICATION_PERMISSION,

                        FLAG_PERMISSION_REVIEW_REQUIRED, FLAG_PERMISSION_REVIEW_REQUIRED, true,

                        0, FLAG_PERMISSION_USER_SET, true, userId);

                        userId);

            }

            }

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            Slog.e(TAG, "Could not reach system server", e);

            Slog.e(TAG, "Could not reach system server", e);

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+0 −22
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.server.pm.permission;

package com.android.server.pm.permission;





import static android.Manifest.permission.CAPTURE_AUDIO_HOTWORD;

import static android.Manifest.permission.CAPTURE_AUDIO_HOTWORD;

import static android.Manifest.permission.POST_NOTIFICATIONS;

import static android.Manifest.permission.RECORD_AUDIO;

import static android.Manifest.permission.RECORD_AUDIO;

import static android.Manifest.permission.UPDATE_APP_OPS_STATS;

import static android.Manifest.permission.UPDATE_APP_OPS_STATS;

import static android.app.AppOpsManager.ATTRIBUTION_CHAIN_ID_NONE;

import static android.app.AppOpsManager.ATTRIBUTION_CHAIN_ID_NONE;
@@ -51,7 +50,6 @@ import android.content.pm.PermissionGroupInfo; 
import android.content.pm.PermissionInfo;

import android.content.pm.PermissionInfo;

import android.content.pm.permission.SplitPermissionInfoParcelable;

import android.content.pm.permission.SplitPermissionInfoParcelable;

import android.os.Binder;

import android.os.Binder;

import android.os.Build;

import android.os.IBinder;

import android.os.IBinder;

import android.os.Process;

import android.os.Process;

import android.os.RemoteException;

import android.os.RemoteException;
@@ -595,26 +593,6 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
            return PermissionManagerService.this.checkUidPermission(uid, permissionName);

            return PermissionManagerService.this.checkUidPermission(uid, permissionName);

        }

        }





        @Override

        public int checkPostNotificationsPermissionGrantedOrLegacyAccess(int uid) {

            int granted = PermissionManagerService.this.checkUidPermission(uid,

                    POST_NOTIFICATIONS);

            AndroidPackage pkg = mPackageManagerInt.getPackage(uid);

            if (pkg == null) {

                Slog.e(LOG_TAG, "No package for uid " + uid);

                return granted;

            }

            if (granted != PackageManager.PERMISSION_GRANTED

                    && pkg.getTargetSdkVersion() >= Build.VERSION_CODES.M) {

                int flags = PermissionManagerService.this.getPermissionFlags(pkg.getPackageName(),

                        POST_NOTIFICATIONS, UserHandle.getUserId(uid));

                if ((flags & PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED) != 0) {

                    return PackageManager.PERMISSION_GRANTED;

                }

            }

            return granted;

        }



        @Override

        @Override

        public void startShellPermissionIdentityDelegation(int uid, @NonNull String packageName,

        public void startShellPermissionIdentityDelegation(int uid, @NonNull String packageName,

                @Nullable List<String> permissionNames) {

                @Nullable List<String> permissionNames) {

services/core/java/com/android/server/pm/permission/PermissionManagerServiceInternal.java

+0 −11
Original line number Original line Diff line number Diff line
@@ -62,17 +62,6 @@ public interface PermissionManagerServiceInternal extends PermissionManagerInter 
    //@SystemApi(client = SystemApi.Client.SYSTEM_SERVER)

    //@SystemApi(client = SystemApi.Client.SYSTEM_SERVER)

    int checkUidPermission(int uid, @NonNull String permissionName);

    int checkUidPermission(int uid, @NonNull String permissionName);





    /**

     * Check whether a particular UID has been granted the POST_NOTIFICATIONS permission, or if

     * access should be granted based on legacy access (currently symbolized by the REVIEW_REQUIRED

     * permission flag

     *

     * @param uid the UID

     * @return {@code PERMISSION_GRANTED} if the permission is granted, or legacy access is granted,

     *         {@code PERMISSION_DENIED} otherwise

     */

    int checkPostNotificationsPermissionGrantedOrLegacyAccess(int uid);



    /**

    /**

     * Adds a listener for runtime permission state (permissions or flags) changes.

     * Adds a listener for runtime permission state (permissions or flags) changes.

     *

     *

services/core/java/com/android/server/policy/PermissionPolicyService.java

+4 −59
Original line number Original line Diff line number Diff line
@@ -915,8 +915,7 @@ public final class PermissionPolicyService extends SystemService { 
            int permissionFlags = mPackageManager.getPermissionFlags(permissionName,

            int permissionFlags = mPackageManager.getPermissionFlags(permissionName,

                    packageName, mContext.getUser());

                    packageName, mContext.getUser());

            boolean isReviewRequired = (permissionFlags & FLAG_PERMISSION_REVIEW_REQUIRED) != 0;

            boolean isReviewRequired = (permissionFlags & FLAG_PERMISSION_REVIEW_REQUIRED) != 0;

            if (isReviewRequired && !CompatChanges.isChangeEnabled(

            if (isReviewRequired) {

                    NOTIFICATION_PERM_CHANGE_ID, packageName, user)) {

                return;

                return;

            }

            }
@@ -1118,49 +1117,14 @@ public final class PermissionPolicyService extends SystemService { 




    private class Internal extends PermissionPolicyInternal {

    private class Internal extends PermissionPolicyInternal {





        // UIDs that, if a grant dialog is shown for POST_NOTIFICATIONS before next reboot,

        // should display a "continue allowing" message, rather than an "allow" message

        private final ArraySet<Integer> mContinueNotifGrantMessageUids = new ArraySet<>();



        private final ActivityInterceptorCallback mActivityInterceptorCallback =

        private final ActivityInterceptorCallback mActivityInterceptorCallback =

                new ActivityInterceptorCallback() {

                new ActivityInterceptorCallback() {

                    @Nullable

                    @Nullable

                    @Override

                    @Override

                    public ActivityInterceptorCallback.ActivityInterceptResult intercept(

                    public ActivityInterceptorCallback.ActivityInterceptResult intercept(

                            ActivityInterceptorInfo info) {

                            ActivityInterceptorInfo info) {

                        String action = info.intent.getAction();

                        ActivityInterceptResult result = null;

                        if (!ACTION_REQUEST_PERMISSIONS_FOR_OTHER.equals(action)

                                && !PackageManager.ACTION_REQUEST_PERMISSIONS.equals(action)) {

                        return null;

                        return null;

                    }

                    }

                        // Only this interceptor can add LEGACY_ACCESS_PERMISSION_NAMES

                        if (info.intent.getStringArrayExtra(PackageManager

                                .EXTRA_REQUEST_PERMISSIONS_LEGACY_ACCESS_PERMISSION_NAMES)

                                != null) {

                            result = new ActivityInterceptResult(

                                    new Intent(info.intent), info.checkedOptions);

                            result.intent.removeExtra(PackageManager

                                    .EXTRA_REQUEST_PERMISSIONS_LEGACY_ACCESS_PERMISSION_NAMES);

                        }

                        if (PackageManager.ACTION_REQUEST_PERMISSIONS.equals(action)

                                && !mContinueNotifGrantMessageUids.contains(info.realCallingUid)) {

                            return result;

                        }

                        if (ACTION_REQUEST_PERMISSIONS_FOR_OTHER.equals(action)) {

                            String otherPkg = info.intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);

                            if (otherPkg == null || (mPackageManager.getPermissionFlags(

                                    POST_NOTIFICATIONS, otherPkg, UserHandle.of(info.userId))

                                    & FLAG_PERMISSION_REVIEW_REQUIRED) == 0) {

                                return result;

                            }

                        }



                        mContinueNotifGrantMessageUids.remove(info.realCallingUid);

                        return new ActivityInterceptResult(info.intent.putExtra(PackageManager

                                        .EXTRA_REQUEST_PERMISSIONS_LEGACY_ACCESS_PERMISSION_NAMES,

                                new String[] { POST_NOTIFICATIONS }), info.checkedOptions);

                    }





                    @Override

                    @Override

                    public void onActivityLaunched(TaskInfo taskInfo, ActivityInfo activityInfo,

                    public void onActivityLaunched(TaskInfo taskInfo, ActivityInfo activityInfo,
@@ -1173,10 +1137,8 @@ public final class PermissionPolicyService extends SystemService { 
                            return;

                            return;

                        }

                        }

                        UserHandle user = UserHandle.of(taskInfo.userId);

                        UserHandle user = UserHandle.of(taskInfo.userId);

                        if (CompatChanges.isChangeEnabled(NOTIFICATION_PERM_CHANGE_ID,

                        if (!CompatChanges.isChangeEnabled(NOTIFICATION_PERM_CHANGE_ID,

                                activityInfo.packageName, user)) {

                                activityInfo.packageName, user)) {

                            clearNotificationReviewFlagsIfNeeded(activityInfo.packageName, user);

                        } else {

                            // Post the activity start checks to ensure the notification channel

                            // Post the activity start checks to ensure the notification channel

                            // checks happen outside the WindowManager global lock.

                            // checks happen outside the WindowManager global lock.

                            mHandler.post(() -> showNotificationPromptIfNeeded(

                            mHandler.post(() -> showNotificationPromptIfNeeded(
@@ -1337,22 +1299,6 @@ public final class PermissionPolicyService extends SystemService { 
                    && isLauncherIntent(taskInfo.baseIntent);

                    && isLauncherIntent(taskInfo.baseIntent);

        }

        }





        private void clearNotificationReviewFlagsIfNeeded(String packageName, UserHandle user) {

            if ((mPackageManager.getPermissionFlags(POST_NOTIFICATIONS, packageName, user)

                    & FLAG_PERMISSION_REVIEW_REQUIRED) == 0) {

                return;

            }

            try {

                int uid = mPackageManager.getPackageUidAsUser(packageName, 0,

                        user.getIdentifier());

                mContinueNotifGrantMessageUids.add(uid);

                mPackageManager.updatePermissionFlags(POST_NOTIFICATIONS, packageName,

                        FLAG_PERMISSION_REVIEW_REQUIRED, 0, user);

            } catch (PackageManager.NameNotFoundException e) {

                // Do nothing

            }

        }



        private void launchNotificationPermissionRequestDialog(String pkgName, UserHandle user,

        private void launchNotificationPermissionRequestDialog(String pkgName, UserHandle user,

                int taskId, @Nullable ActivityInterceptorInfo info) {

                int taskId, @Nullable ActivityInterceptorInfo info) {

            Intent grantPermission = mPackageManager

            Intent grantPermission = mPackageManager
@@ -1469,8 +1415,7 @@ public final class PermissionPolicyService extends SystemService { 
                    == PackageManager.PERMISSION_GRANTED;

                    == PackageManager.PERMISSION_GRANTED;

            int flags = mPackageManager.getPermissionFlags(POST_NOTIFICATIONS, pkgName, user);

            int flags = mPackageManager.getPermissionFlags(POST_NOTIFICATIONS, pkgName, user);

            boolean explicitlySet = (flags & PermissionManager.EXPLICIT_SET_FLAGS) != 0;

            boolean explicitlySet = (flags & PermissionManager.EXPLICIT_SET_FLAGS) != 0;

            boolean needsReview = (flags & FLAG_PERMISSION_REVIEW_REQUIRED) != 0;

            return !granted && hasCreatedNotificationChannels && !explicitlySet;

            return !granted && hasCreatedNotificationChannels && (needsReview || !explicitlySet);

        }

        }

    }

    }

}
 
}

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

+9 −26
Original line number Original line Diff line number Diff line
@@ -17,7 +17,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_GRANTED_BY_DEFAULT;

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

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

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

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

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

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

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

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

import static android.content.pm.PackageManager.GET_PERMISSIONS;
@@ -87,12 +86,12 @@ public class PermissionHelperTest extends UiServiceTestCase { 




    @Test

    @Test

    public void testHasPermission() throws Exception {

    public void testHasPermission() throws Exception {

        when(mPmi.checkPostNotificationsPermissionGrantedOrLegacyAccess(anyInt()))

        when(mPmi.checkUidPermission(anyInt(), anyString()))

                .thenReturn(PERMISSION_GRANTED);

                .thenReturn(PERMISSION_GRANTED);





        assertThat(mPermissionHelper.hasPermission(1)).isTrue();

        assertThat(mPermissionHelper.hasPermission(1)).isTrue();





        when(mPmi.checkPostNotificationsPermissionGrantedOrLegacyAccess(anyInt()))

        when(mPmi.checkUidPermission(anyInt(), anyString()))

                .thenReturn(PERMISSION_DENIED);

                .thenReturn(PERMISSION_DENIED);





        assertThat(mPermissionHelper.hasPermission(1)).isFalse();

        assertThat(mPermissionHelper.hasPermission(1)).isFalse();
@@ -184,21 +183,7 @@ public class PermissionHelperTest extends UiServiceTestCase { 
        verify(mPermManager).grantRuntimePermission(

        verify(mPermManager).grantRuntimePermission(

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

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

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

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

                FLAG_PERMISSION_USER_SET | FLAG_PERMISSION_REVIEW_REQUIRED,

                FLAG_PERMISSION_USER_SET, FLAG_PERMISSION_USER_SET, true, 10);

                FLAG_PERMISSION_USER_SET, true, 10);

    }



    @Test

    public void testSetNotificationPermission_grantReviewRequired() throws Exception {

        when(mPmi.checkPermission(anyString(), anyString(), anyInt()))

                .thenReturn(PERMISSION_DENIED);



        mPermissionHelper.setNotificationPermission("pkg", 10, true, false, true);



        verify(mPermManager, never()).revokeRuntimePermission(

                "pkg", Manifest.permission.POST_NOTIFICATIONS, 10, "PermissionHelper");

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

                FLAG_PERMISSION_REVIEW_REQUIRED, FLAG_PERMISSION_REVIEW_REQUIRED, true, 10);

    }

    }





    @Test

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

        verify(mPermManager).grantRuntimePermission(

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

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

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

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

                FLAG_PERMISSION_USER_SET | FLAG_PERMISSION_REVIEW_REQUIRED,

                FLAG_PERMISSION_USER_SET, FLAG_PERMISSION_USER_SET, true, 10);

                FLAG_PERMISSION_USER_SET, true, 10);

    }

    }





    @Test

    @Test
@@ -230,8 +214,7 @@ public class PermissionHelperTest extends UiServiceTestCase { 
        verify(mPermManager).revokeRuntimePermission(

        verify(mPermManager).revokeRuntimePermission(

                eq("pkg"), eq(Manifest.permission.POST_NOTIFICATIONS), eq(10), anyString());

                eq("pkg"), eq(Manifest.permission.POST_NOTIFICATIONS), eq(10), anyString());

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

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

                FLAG_PERMISSION_USER_SET | FLAG_PERMISSION_REVIEW_REQUIRED,

                FLAG_PERMISSION_USER_SET, FLAG_PERMISSION_USER_SET, true, 10);

                FLAG_PERMISSION_USER_SET, true, 10);

    }

    }





    @Test

    @Test
@@ -243,8 +226,8 @@ public class PermissionHelperTest extends UiServiceTestCase { 




        verify(mPermManager).grantRuntimePermission(

        verify(mPermManager).grantRuntimePermission(

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

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

        verify(mPermManager, never()).updatePermissionFlags(

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

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

                0, FLAG_PERMISSION_USER_SET, true, 10);

    }

    }





    @Test

    @Test
@@ -256,8 +239,8 @@ public class PermissionHelperTest extends UiServiceTestCase { 




        verify(mPermManager).revokeRuntimePermission(

        verify(mPermManager).revokeRuntimePermission(

                eq("pkg"), eq(Manifest.permission.POST_NOTIFICATIONS), eq(10), anyString());

                eq("pkg"), eq(Manifest.permission.POST_NOTIFICATIONS), eq(10), anyString());

        verify(mPermManager, never()).updatePermissionFlags(

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

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

                0, FLAG_PERMISSION_USER_SET, true, 10);

    }

    }





    @Test

    @Test