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

Commit a84c7efb authored by Luca Stefani's avatar Luca Stefani Committed by Michael Bestas
Browse files

Make default permissions updates tied to version incremental 

Otherwise adding new rules won't have any effect for us.

Change-Id: Ib81082a184956ea550bdccdbdf53b2b4cc48f487
parent f529a67b

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

+6 −4
Original line number Diff line number Diff line
@@ -4244,7 +4244,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
            final int userId = livingUsers.get(i).id;

            final boolean isPermissionUpgradeNeeded = !Objects.equals(

                    mPermissionManager.getDefaultPermissionGrantFingerprint(userId),

                    Build.FINGERPRINT);

                    Build.VERSION.INCREMENTAL);

            if (isPermissionUpgradeNeeded) {

                grantPermissionsUserIds = ArrayUtils.appendInt(

                        grantPermissionsUserIds, userId);
@@ -4253,7 +4253,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
        // If we upgraded grant all default permissions before kicking off.

        for (int userId : grantPermissionsUserIds) {

            mLegacyPermissionManager.grantDefaultPermissions(userId);

            mPermissionManager.setDefaultPermissionGrantFingerprint(Build.FINGERPRINT, userId);

            mPermissionManager.setDefaultPermissionGrantFingerprint(

                    Build.VERSION.INCREMENTAL, userId);

        }

        if (grantPermissionsUserIds == EMPTY_INT_ARRAY) {

            // If we did not grant default permissions, we preload from this the
@@ -4435,7 +4436,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
        if (!convertedFromPreCreated || !readPermissionStateForUser(userId)) {

            mPermissionManager.onUserCreated(userId);

            mLegacyPermissionManager.grantDefaultPermissions(userId);

            mPermissionManager.setDefaultPermissionGrantFingerprint(Build.FINGERPRINT, userId);

            mPermissionManager.setDefaultPermissionGrantFingerprint(

                    Build.VERSION.INCREMENTAL, userId);

            mDomainVerificationManager.clearUser(userId);

        }

    }
@@ -4447,7 +4449,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
            mPermissionManager.readLegacyPermissionStateTEMP();

            final boolean isPermissionUpgradeNeeded = !Objects.equals(

                    mPermissionManager.getDefaultPermissionGrantFingerprint(userId),

                    Build.FINGERPRINT);

                    Build.VERSION.INCREMENTAL);

            return isPermissionUpgradeNeeded;

        }

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -4644,7 +4644,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 
    @Nullable

    @Override

    public String getDefaultPermissionGrantFingerprint(@UserIdInt int userId) {

        return mPackageManagerInt.isPermissionUpgradeNeeded(userId) ? null : Build.FINGERPRINT;

        return mPackageManagerInt.isPermissionUpgradeNeeded(userId)

                ? null : Build.VERSION.INCREMENTAL;

    }



    @Override