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

Commit aadc76a3 authored by Chad Brubaker's avatar Chad Brubaker Committed by Android (Google) Code Review
Browse files

Merge "Replace uses of UsesPermissionInfo."

parents 8173d940 155c62f7

src/com/android/packageinstaller/permission/model/AppPermissionGroup.java

+2 −4
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.content.pm.PackageManager; 
import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.PermissionGroupInfo;

import android.content.pm.PermissionInfo;

import android.content.pm.UsesPermissionInfo;

import android.os.Build;

import android.os.UserHandle;

import android.os.storage.StorageManager;
@@ -1187,9 +1186,8 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> 
            boolean imagesGranted = mPackageManager.checkPermission(READ_MEDIA_IMAGES,

                    mPackageInfo.packageName) == PERMISSION_GRANTED;



            if (!ArrayUtils.isEmpty(mPackageInfo.usesPermissions)) {

                for (UsesPermissionInfo upi : mPackageInfo.usesPermissions) {

                    final String permission = upi.getPermission();

            if (!ArrayUtils.isEmpty(mPackageInfo.requestedPermissions)) {

                for (String permission : mPackageInfo.requestedPermissions) {

                    if (READ_EXTERNAL_STORAGE.equals(permission)

                            || WRITE_EXTERNAL_STORAGE.equals(permission)) {

                        if (audioGranted || videoGranted || imagesGranted) {

src/com/android/packageinstaller/permission/model/PermissionGroups.java

+3 −4
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.content.pm.PackageItemInfo; 
import android.content.pm.PackageManager;

import android.content.pm.PermissionGroupInfo;

import android.content.pm.PermissionInfo;

import android.content.pm.UsesPermissionInfo;

import android.graphics.drawable.Drawable;

import android.os.Bundle;

import android.os.Handler;
@@ -224,11 +223,11 @@ public final class PermissionGroups implements LoaderCallbacks<List<PermissionGr 
        // We will filter out permissions that no package requests.

        Set<String> requestedPermissions = new ArraySet<>();

        for (PackageInfo installedPackage : installedPackages) {

            if (installedPackage.usesPermissions == null) {

            if (installedPackage.requestedPermissions == null) {

                continue;

            }

            for (UsesPermissionInfo usedPermission : installedPackage.usesPermissions) {

                requestedPermissions.add(usedPermission.name);

            for (String permission : installedPackage.requestedPermissions) {

                requestedPermissions.add(permission);

            }

        }