Revert "Expand location for everybody"

This reverts commit 6f7c486ece2256e118cdd65d67c4c1e81f2eb22b.

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

1 files changed, 2 insertions, 8 deletions

diff --git a/src/com/android/packageinstaller/permission/service/RuntimePermissionsUpgradeController.java b/src/com/android/packageinstaller/permission/service/RuntimePermissionsUpgradeController.java
index 65c348c1..cedb108e 100644
--- a/src/com/android/packageinstaller/permission/service/RuntimePermissionsUpgradeController.java
+++ b/src/com/android/packageinstaller/permission/service/RuntimePermissionsUpgradeController.java
@@ -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());
                         }