Extract counting of installed apps into helper class
This CL extracts the code that counts the number of installed apps for a set of users from ManageApplications to a helper class, InstalledAppCounter. The new helper is designed to be unit-testable (PackageManager dependencies are injected via a new PackageManagerWrapper abstraction) and customizable (the set of users for which to count is specified by subclasses). The CL adds a unit test for the InstalledAppCounter as well. Test: make RunSettingsRoboTests Bug: 32692748 Change-Id: Ie7fbd40d9dd998b27f1f9de227b6a187b5c9d315
This commit is contained in:
@@ -17,44 +17,36 @@ package com.android.settings.applications;
|
||||
import android.app.AppGlobals;
|
||||
import android.content.Context;
|
||||
import android.content.pm.ApplicationInfo;
|
||||
import android.content.pm.IPackageManager;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.pm.ParceledListSlice;
|
||||
import android.content.pm.UserInfo;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.RemoteException;
|
||||
import android.os.UserHandle;
|
||||
import android.os.UserManager;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public abstract class AppCounter extends AsyncTask<Void, Void, Integer> {
|
||||
|
||||
protected final PackageManager mPm;
|
||||
protected final IPackageManager mIpm;
|
||||
protected final PackageManagerWrapper mPm;
|
||||
protected final UserManager mUm;
|
||||
|
||||
public AppCounter(Context context) {
|
||||
mPm = context.getPackageManager();
|
||||
mIpm = AppGlobals.getPackageManager();
|
||||
public AppCounter(Context context, PackageManagerWrapper packageManager) {
|
||||
mPm = packageManager;
|
||||
mUm = UserManager.get(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Integer doInBackground(Void... params) {
|
||||
int count = 0;
|
||||
for (UserInfo user : mUm.getProfiles(UserHandle.myUserId())) {
|
||||
try {
|
||||
@SuppressWarnings("unchecked")
|
||||
ParceledListSlice<ApplicationInfo> list =
|
||||
mIpm.getInstalledApplications(PackageManager.GET_DISABLED_COMPONENTS
|
||||
| PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS
|
||||
| (user.isAdmin() ? PackageManager.GET_UNINSTALLED_PACKAGES : 0),
|
||||
user.id);
|
||||
for (ApplicationInfo info : list.getList()) {
|
||||
if (includeInCount(info)) {
|
||||
count++;
|
||||
}
|
||||
for (UserInfo user : getUsersToCount()) {
|
||||
final List<ApplicationInfo> list =
|
||||
mPm.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
|
||||
| PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS
|
||||
| (user.isAdmin() ? PackageManager.GET_UNINSTALLED_PACKAGES : 0),
|
||||
user.id);
|
||||
for (ApplicationInfo info : list) {
|
||||
if (includeInCount(info)) {
|
||||
count++;
|
||||
}
|
||||
} catch (RemoteException e) {
|
||||
}
|
||||
}
|
||||
return count;
|
||||
@@ -66,5 +58,6 @@ public abstract class AppCounter extends AsyncTask<Void, Void, Integer> {
|
||||
}
|
||||
|
||||
protected abstract void onCountComplete(int num);
|
||||
protected abstract List<UserInfo> getUsersToCount();
|
||||
protected abstract boolean includeInCount(ApplicationInfo info);
|
||||
}
|
||||
|
Reference in New Issue
Block a user