Merge "Remove temp handling of POST_NOTIFICATIONS" into tm-dev

This commit is contained in:
Nate Myren
2022-04-20 22:42:31 +00:00
committed by Android (Google) Code Review

View File

@@ -2645,12 +2645,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
// Cache newImplicitPermissions before modifing permissionsState as for the
// shared uids the original and new state are the same object
// TODO(205888750): remove the line for LEGACY_REVIEW once propagated through
// droidfood
if (!origState.hasPermissionState(permName)
&& (pkg.getImplicitPermissions().contains(permName)
|| (permName.equals(Manifest.permission.ACTIVITY_RECOGNITION)))
|| NOTIFICATION_PERMISSIONS.contains(permName)) {
|| (permName.equals(Manifest.permission.ACTIVITY_RECOGNITION)))) {
if (pkg.getImplicitPermissions().contains(permName)) {
// If permName is an implicit permission, try to auto-grant
newImplicitPermissions.add(permName);