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

Commit 13371b26 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Get split permissions from system-api"

parents 87185455 4fc75203
Loading
Loading
Loading
Loading
+6 −5
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.PackageParser;
import android.content.res.Resources;
import android.graphics.drawable.Icon;
import android.os.Build;
import android.os.Bundle;
import android.permission.PermissionManager;
import android.text.Html;
import android.text.Spanned;
import android.util.ArrayMap;
@@ -806,10 +806,11 @@ public class GrantPermissionsActivity extends Activity
        // affected
        ArrayList<String> splitPerms = new ArrayList<>();
        splitPerms.add(permission);
        for (PackageParser.SplitPermissionInfo splitPerm : PackageParser.SPLIT_PERMISSIONS) {
            if (requestingAppTargetSDK < splitPerm.targetSdk
                    && permission.equals(splitPerm.rootPerm)) {
                Collections.addAll(splitPerms, splitPerm.newPerms);
        for (PermissionManager.SplitPermissionInfo splitPerm
                : getSystemService(PermissionManager.class).getSplitPermissions()) {
            if (requestingAppTargetSDK < splitPerm.getTargetSdk()
                    && permission.equals(splitPerm.getRootPermission())) {
                Collections.addAll(splitPerms, splitPerm.getNewPermissions());
            }
        }