From 451be3d422e423fe016e85b8581424cb55495869 Mon Sep 17 00:00:00 2001 From: Nate Myren Date: Mon, 31 Jan 2022 09:24:32 -0800 Subject: Do not list REVIEW_REQUIRED pre-M apps as granted notifications Bug: 216812098 Test: manual Change-Id: I09d254c97eb7237944ee40176211df88a11e184b --- .../com/android/server/pm/permission/PermissionManagerService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java index 79c5ea2efefe..edc0e3d64c42 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java @@ -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; -- cgit v1.2.3-59-g8ed1b