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

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

Merge "Revert "Remove REVIEW_REQUIRED from droidfooder phones"" into tm-dev

parents 3079ea52 2988f1cf

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

+2 −4
Original line number Diff line number Diff line
@@ -2816,14 +2816,12 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 
                            }



                            // Remove review flag as it is not necessary anymore

                            // TODO(b/227186603) re-enable check for notification permission once

                            // droidfood state has been cleared

                            //if (!NOTIFICATION_PERMISSIONS.contains(perm)) {

                            if (!NOTIFICATION_PERMISSIONS.contains(perm)) {

                                if ((flags & FLAG_PERMISSION_REVIEW_REQUIRED) != 0) {

                                    flags &= ~FLAG_PERMISSION_REVIEW_REQUIRED;

                                    wasChanged = true;

                                }

                            //}

                            }



                            if ((flags & FLAG_PERMISSION_REVOKED_COMPAT) != 0

                                    && !isPermissionSplitFromNonRuntime(permName,