From 21c84e94bab604351ea4fcc469fb69ff2053ac20 Mon Sep 17 00:00:00 2001 From: Nate Myren Date: Tue, 11 Jan 2022 10:18:50 -0800 Subject: [PATCH] Remove temporary exceptions from notification dialog code Now that pregrants are in place, these lines are no longer needed Test: manual Bug: 194833441 Change-Id: Ibf6359c217b04c00ebc01080a2b7e51f06f741ba --- .../android/server/policy/PermissionPolicyService.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/policy/PermissionPolicyService.java b/services/core/java/com/android/server/policy/PermissionPolicyService.java index 10d9bbf4c3082..c9a8701ec7afe 100644 --- a/services/core/java/com/android/server/policy/PermissionPolicyService.java +++ b/services/core/java/com/android/server/policy/PermissionPolicyService.java @@ -1139,13 +1139,11 @@ public final class PermissionPolicyService extends SystemService { private boolean shouldForceShowNotificationPermissionRequest(@NonNull String pkgName, @NonNull UserHandle user) { AndroidPackage pkg = mPackageManagerInternal.getPackage(pkgName); - // TODO(b/205888750): Remove platform key and permissionController lines after pregrants - // are in place - if (pkg == null || pkg.getPackageName() == null || pkg.isSignedWithPlatformKey() - || pkg.getPackageName().contains("nexuslauncher") + if (pkg == null || pkg.getPackageName() == null || Objects.equals(pkgName, mPackageManager.getPermissionControllerPackageName()) || pkg.getTargetSdkVersion() < Build.VERSION_CODES.M) { - // TODO(b/205888750) add warning logs when pregrants in place + Slog.w(LOG_TAG, "Cannot check for Notification prompt, no package for " + + pkgName + " or pkg is Permission Controller"); return false; }