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

Commit 7f637681 authored by Hai Zhang's avatar Hai Zhang Committed by Android (Google) Code Review
Browse files

Merge "Don't call getGrantedPermissions() when generating package info without... 

Merge "Don't call getGrantedPermissions() when generating package info without GET_PERMISSIONS." into sc-dev
parents b2724e8c df64212c

services/core/java/com/android/server/pm/PackageManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -3173,8 +3173,8 @@ public class PackageManagerService extends IPackageManager.Stub 
                final int[] gids = (flags & PackageManager.GET_GIDS) == 0 ? EMPTY_INT_ARRAY

                        : mPermissionManager.getGidsForUid(UserHandle.getUid(userId, ps.appId));

                // Compute granted permissions only if package has requested permissions

                final Set<String> permissions = ArrayUtils.isEmpty(p.getRequestedPermissions())

                        ? Collections.emptySet()

                final Set<String> permissions = ((flags & PackageManager.GET_PERMISSIONS) == 0

                        || ArrayUtils.isEmpty(p.getRequestedPermissions())) ? Collections.emptySet()

                        : mPermissionManager.getGrantedPermissions(ps.name, userId);















                PackageInfo packageInfo = PackageInfoUtils.generate(p, gids, flags,