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

Commit 155c62f7 authored by Joel Galenson's avatar Joel Galenson
Browse files

Replace uses of UsesPermissionInfo. 

It's going away.

Bug: 123699931
Test: Open various Permission Controller screens.
Change-Id: I9f2644e147c220f05e05df7ba63be34a178c2551
parent 2a1c9210

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);

            }

        }