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

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

Merge "Replace PackageManagerWrapper with PackageManager"

parents 06aaddbc 5693be28

src/com/android/settings/accessibility/ShortcutServicePickerFragment.java

+3 −5
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import com.android.settings.widget.RadioButtonPickerFragment; 
import com.android.settings.widget.RadioButtonPreference;

import com.android.settingslib.accessibility.AccessibilityUtils;

import com.android.settingslib.widget.CandidateInfo;

import com.android.settingslib.wrapper.PackageManagerWrapper;



import java.util.ArrayList;

import java.util.List;
@@ -229,10 +228,9 @@ public class ShortcutServicePickerFragment extends RadioButtonPickerFragment { 


        @Override

        public CharSequence loadLabel() {

            final PackageManagerWrapper pmw =

                    new PackageManagerWrapper(getContext().getPackageManager());

            final PackageManager pmw = getContext().getPackageManager();

            final CharSequence label =

                    mServiceInfo.getResolveInfo().serviceInfo.loadLabel(pmw.getPackageManager());

                    mServiceInfo.getResolveInfo().serviceInfo.loadLabel(pmw);

            if (label != null) {

                return label;

            }
@@ -242,7 +240,7 @@ public class ShortcutServicePickerFragment extends RadioButtonPickerFragment { 
                try {

                    final ApplicationInfo appInfo = pmw.getApplicationInfoAsUser(

                            componentName.getPackageName(), 0, UserHandle.myUserId());

                    return appInfo.loadLabel(pmw.getPackageManager());

                    return appInfo.loadLabel(pmw);

                } catch (PackageManager.NameNotFoundException e) {

                    return null;

                }

src/com/android/settings/applications/AppCounter.java

+2 −4
Original line number Diff line number Diff line
@@ -22,16 +22,14 @@ import android.os.AsyncTask; 
import android.os.UserHandle;

import android.os.UserManager;



import com.android.settingslib.wrapper.PackageManagerWrapper;



import java.util.List;



public abstract class AppCounter extends AsyncTask<Void, Void, Integer> {



    protected final PackageManagerWrapper mPm;

    protected final PackageManager mPm;

    protected final UserManager mUm;



    public AppCounter(Context context, PackageManagerWrapper packageManager) {

    public AppCounter(Context context, PackageManager packageManager) {

        mPm = packageManager;

        mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);

    }

src/com/android/settings/applications/AppLister.java

+2 −4
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import android.os.AsyncTask; 
import android.os.UserHandle;

import android.os.UserManager;



import com.android.settingslib.wrapper.PackageManagerWrapper;



import java.util.ArrayList;

import java.util.List;
@@ -35,10 +33,10 @@ import java.util.List; 
 * of just counting them.

 */

public abstract class AppLister extends AsyncTask<Void, Void, List<UserAppInfo>> {

    protected final PackageManagerWrapper mPm;

    protected final PackageManager mPm;

    protected final UserManager mUm;



    public AppLister(PackageManagerWrapper packageManager, UserManager userManager) {

    public AppLister(PackageManager packageManager, UserManager userManager) {

        mPm = packageManager;

        mUm = userManager;

    }

src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounter.java

+2 −4
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import android.os.Build; 
import android.os.RemoteException;

import android.os.UserHandle;



import com.android.settingslib.wrapper.PackageManagerWrapper;



/**

 * Counts installed apps across all users that have been granted one or more specific permissions by

 * the admin.
@@ -36,7 +34,7 @@ public abstract class AppWithAdminGrantedPermissionsCounter extends AppCounter { 
    private final DevicePolicyManager mDevicePolicyManager;



    public AppWithAdminGrantedPermissionsCounter(Context context, String[] permissions,

            PackageManagerWrapper packageManager, IPackageManager packageManagerService,

            PackageManager packageManager, IPackageManager packageManagerService,

            DevicePolicyManager devicePolicyManager) {

        super(context, packageManager);

        mPermissions = permissions;
@@ -51,7 +49,7 @@ public abstract class AppWithAdminGrantedPermissionsCounter extends AppCounter { 
    }



    public static boolean includeInCount(String[] permissions,

            DevicePolicyManager devicePolicyManager, PackageManagerWrapper packageManager,

            DevicePolicyManager devicePolicyManager, PackageManager packageManager,

            IPackageManager packageManagerService, ApplicationInfo info) {

        if (info.targetSdkVersion >= Build.VERSION_CODES.M) {

            // The app uses run-time permissions. Check whether one or more of the permissions were

src/com/android/settings/applications/AppWithAdminGrantedPermissionsLister.java

+2 −3
Original line number Diff line number Diff line
@@ -19,10 +19,9 @@ package com.android.settings.applications; 
import android.app.admin.DevicePolicyManager;

import android.content.pm.ApplicationInfo;

import android.content.pm.IPackageManager;

import android.content.pm.PackageManager;

import android.os.UserManager;



import com.android.settingslib.wrapper.PackageManagerWrapper;



/**

 * Lists installed apps across all users that have been granted one or more specific permissions by

 * the admin.
@@ -33,7 +32,7 @@ public abstract class AppWithAdminGrantedPermissionsLister extends AppLister { 
    private final DevicePolicyManager mDevicePolicyManager;



    public AppWithAdminGrantedPermissionsLister(String[] permissions,

            PackageManagerWrapper packageManager, IPackageManager packageManagerService,

            PackageManager packageManager, IPackageManager packageManagerService,

            DevicePolicyManager devicePolicyManager, UserManager userManager) {

        super(packageManager, userManager);

        mPermissions = permissions;