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

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

Merge "Do not list REVIEW_REQUIRED pre-M apps as granted notifications"

parents 1a8fe9a3 451be3d4

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

+4 −2
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import android.content.pm.PermissionGroupInfo; 
import android.content.pm.PermissionInfo;

import android.content.pm.permission.SplitPermissionInfoParcelable;

import android.os.Binder;

import android.os.Build;

import android.os.IBinder;

import android.os.Process;

import android.os.RemoteException;
@@ -613,11 +614,12 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
            int granted = PermissionManagerService.this.checkUidPermission(uid,

                    POST_NOTIFICATIONS);

            AndroidPackage pkg = mPackageManagerInt.getPackage(uid);

            if (granted != PermissionManager.PERMISSION_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 PermissionManager.PERMISSION_GRANTED;

                    return PackageManager.PERMISSION_GRANTED;

                }

            }

            return granted;