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

Commit d68c4be4 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Revert "Expand location for everybody" 

This reverts commit 6f7c486e.

Reason for revert: Droidfood daily and weekly got fixed. Hence no need to keep this in anymore.
Fixes: 118661683
Test: Clean revert
Change-Id: I3e17ef18220a76d7c4e035575ffd7d915b56a137
parent 6f7c486e

src/com/android/packageinstaller/permission/service/RuntimePermissionsUpgradeController.java

+2 −8
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ class RuntimePermissionsUpgradeController { 
        final int appCount = apps.size();



        final boolean sdkUpgradedFromP;

        boolean isFreshInstall = false;



        if (currentVersion <= -1) {

            Log.i(LOG_TAG, "Upgrading from Android P");
@@ -92,10 +90,6 @@ class RuntimePermissionsUpgradeController { 
        }



        if (currentVersion == 0) {

            if (!sdkUpgradedFromP) {

                isFreshInstall = true;

            }



            Log.i(LOG_TAG, "Grandfathering SMS and CallLog permissions");



            final List<String> smsPermissions = Utils.getPlatformPermissionNamesOfGroup(
@@ -184,7 +178,7 @@ class RuntimePermissionsUpgradeController { 
        }



        if (currentVersion == 6) {

            if (!isFreshInstall || sdkUpgradedFromP) {

            if (sdkUpgradedFromP) {

                Log.i(LOG_TAG, "Expanding location permissions");



                for (int i = 0; i < appCount; i++) {
@@ -206,7 +200,7 @@ class RuntimePermissionsUpgradeController { 


                        if (group.areRuntimePermissionsGranted()

                                && bgGroup != null

                                && !bgGroup.isSystemFixed()

                                && !bgGroup.isUserSet() && !bgGroup.isSystemFixed()

                                && !bgGroup.isPolicyFixed()) {

                            bgGroup.grantRuntimePermissions(group.isUserFixed());

                        }