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

Commit cf8ec275 authored by Svet Ganov's avatar Svet Ganov Committed by Android Git Automerger
Browse files

am 1aaad610: Merge "Do not hold a lock when calling API to grant default permissions" into mnc-dev

* commit '1aaad610':
  Do not hold a lock when calling API to grant default permissions
parents 94d225d8 1aaad610
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -3411,11 +3411,16 @@ public class PackageManagerService extends IPackageManager.Stub {
                    "resetRuntimePermissions");
        }
        final int[] userIds;
        synchronized (mPackages) {
            updatePermissionsLPw(null, null, UPDATE_PERMISSIONS_ALL);
            for (int userId : UserManagerService.getInstance().getUserIds()) {
                mDefaultPermissionPolicy.grantDefaultPermissions(userId);
            final int userCount = UserManagerService.getInstance().getUserIds().length;
            userIds = Arrays.copyOf(UserManagerService.getInstance().getUserIds(), userCount);
        }
        for (int userId : userIds) {
            mDefaultPermissionPolicy.grantDefaultPermissions(userId);
        }
    }