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

Commit bd6435b6 authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Remove REVIEW_REQUIRED from droidfooder phones"" into tm-dev am: d8a13fd0 am: c7eb8801

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18149050



Change-Id: I3b15ff53c8eccd8860a0fa2e818064cfef769f84
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 51d00903 c7eb8801

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

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

                            }





                            // Remove review flag as it is not necessary anymore

                            // Remove review flag as it is not necessary anymore

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

                            if (!NOTIFICATION_PERMISSIONS.contains(perm)) {

                            // droidfood state has been cleared

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

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

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

                                    flags &= ~FLAG_PERMISSION_REVIEW_REQUIRED;

                                    flags &= ~FLAG_PERMISSION_REVIEW_REQUIRED;

                                    wasChanged = true;

                                    wasChanged = true;

                                }

                                }

                            //}

                            }





                            if ((flags & FLAG_PERMISSION_REVOKED_COMPAT) != 0

                            if ((flags & FLAG_PERMISSION_REVOKED_COMPAT) != 0

                                    && !isPermissionSplitFromNonRuntime(permName,

                                    && !isPermissionSplitFromNonRuntime(permName,