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

Commit f2b01df8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not revoke POST_NOTIFICATIONS for pre-M apps"

parents 01bfee50 b20012ab

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

+6 −2
Original line number Diff line number Diff line
@@ -3181,9 +3181,13 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 
                    ps.updatePermissionFlags(bp, PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED

                                    | FLAG_PERMISSION_REVOKE_WHEN_REQUESTED,

                            PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED);

                    // TODO(b/205888750): remove revoke once propagated through droidfood

                    if (ps.isPermissionGranted(newPerm)) {

                    // TODO(b/205888750): remove if/else block once propagated through droidfood

                    if (ps.isPermissionGranted(newPerm)

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

                        ps.revokePermission(bp);

                    } else if (!ps.isPermissionGranted(newPerm)

                            && pkg.getTargetSdkVersion() < Build.VERSION_CODES.M) {

                        ps.grantPermission(bp);

                    }

                }

            }