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

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

Remove code resetting the loc perm on upgrade

Bug: 129340674
Test: Restored location permissions
Change-Id: I3cf8546676737d9866abe38f122d0ca02095e768
parent daaa6b79
Loading
Loading
Loading
Loading
+0 −15
Original line number Diff line number Diff line
@@ -20,11 +20,9 @@ import static android.content.Context.MODE_PRIVATE;
import static android.content.pm.PackageManager.FLAG_PERMISSION_POLICY_FIXED;
import static android.content.pm.PackageManager.FLAG_PERMISSION_SYSTEM_FIXED;
import static android.content.pm.PackageManager.GET_PERMISSIONS;
import static android.provider.Settings.Secure.LOCATION_PERMISSIONS_UPGRADE_TO_Q_MODE;
import static android.util.Xml.newSerializer;

import static com.android.packageinstaller.Constants.DELAYED_RESTORE_PERMISSIONS_FILE;
import static com.android.packageinstaller.permission.utils.Utils.getGroupOfPlatformPermission;

import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
import static org.xmlpull.v1.XmlPullParser.END_TAG;
@@ -32,7 +30,6 @@ import static org.xmlpull.v1.XmlPullParser.START_TAG;

import static java.nio.charset.StandardCharsets.UTF_8;

import android.Manifest;
import android.content.Context;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
@@ -40,8 +37,6 @@ import android.os.Build;
import android.os.UserHandle;
import android.permission.PermissionManager;
import android.permission.PermissionManager.SplitPermissionInfo;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
import android.util.Xml;

@@ -62,7 +57,6 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

/**
@@ -415,15 +409,6 @@ public class BackupHelper {
                        + ATTR_PERMISSION_NAME);
            }

            // Clear location permission on upgrade to Q or later
            String group = getGroupOfPlatformPermission(permName);
            if (backupPlatformVersion < Build.VERSION_CODES.Q && TextUtils.equals(group,
                    Manifest.permission_group.LOCATION)
                    && Settings.Secure.getInt(context.getContentResolver(),
                    LOCATION_PERMISSIONS_UPGRADE_TO_Q_MODE, 0) == 0) {
                return Collections.emptyList();
            }

            ArrayList<String> expandedPermissions = new ArrayList<>();
            expandedPermissions.add(permName);