Merge "Remove wrapper for ConnectionManager/IPackageManager" into pi-dev (4720ba39) · Commits · e / os / android_packages_apps_Settings

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

+8 −7

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import android.app.AppGlobals;
		import android.app.AppOpsManager;
		import android.app.AppOpsManager.PackageOps;
		import android.content.Context;
		import android.content.pm.IPackageManager;
		import android.content.pm.PackageInfo;
		import android.content.pm.PackageManager;
		import android.os.RemoteException;
		@@ -31,7 +32,6 @@ import android.util.SparseArray;

		import com.android.settingslib.applications.ApplicationsState;
		import com.android.settingslib.applications.ApplicationsState.AppEntry;
		import com.android.settings.wrapper.IPackageManagerWrapper;

		import java.util.Arrays;
		import java.util.Collection;
		@@ -47,7 +47,7 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge {

		private static final String TAG = "AppStateAppOpsBridge";

		private final IPackageManagerWrapper mIPackageManager;
		private final IPackageManager mIPackageManager;
		private final UserManager mUserManager;
		private final List<UserHandle> mProfiles;
		private final AppOpsManager mAppOpsManager;
		@@ -58,12 +58,12 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge {
		public AppStateAppOpsBridge(Context context, ApplicationsState appState, Callback callback,
		int appOpsOpCode, String[] permissions) {
		this(context, appState, callback, appOpsOpCode, permissions,
		new IPackageManagerWrapper(AppGlobals.getPackageManager()));
		AppGlobals.getPackageManager());
		}

		@VisibleForTesting
		AppStateAppOpsBridge(Context context, ApplicationsState appState, Callback callback,
		int appOpsOpCode, String[] permissions, IPackageManagerWrapper packageManager) {
		int appOpsOpCode, String[] permissions, IPackageManager packageManager) {
		super(appState, callback);
		mContext = context;
		mIPackageManager = packageManager;
		@@ -210,9 +210,10 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge {
		if (entriesForProfile == null) {
		continue;
		}
		@SuppressWarnings("unchecked")
		final List<PackageInfo> packageInfos = mIPackageManager
		.getPackagesHoldingPermissions(mPermissions, 0, profileId).getList();
		@SuppressWarnings("unchecked") final List<PackageInfo> packageInfos =
		mIPackageManager
		.getPackagesHoldingPermissions(mPermissions, 0,
		profileId).getList();
		final int packageInfoCount = packageInfos != null ? packageInfos.size() : 0;
		for (int i = 0; i < packageInfoCount; i++) {
		final PackageInfo packageInfo = packageInfos.get(i);

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -17,12 +17,12 @@ package com.android.settings.applications;
		import android.app.admin.DevicePolicyManager;
		import android.content.Context;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.IPackageManager;
		import android.content.pm.PackageManager;
		import android.os.Build;
		import android.os.RemoteException;
		import android.os.UserHandle;

		import com.android.settings.wrapper.IPackageManagerWrapper;
		import com.android.settingslib.wrapper.PackageManagerWrapper;

		/**
		@@ -32,11 +32,11 @@ import com.android.settingslib.wrapper.PackageManagerWrapper;
		public abstract class AppWithAdminGrantedPermissionsCounter extends AppCounter {

		private final String[] mPermissions;
		private final IPackageManagerWrapper mPackageManagerService;
		private final IPackageManager mPackageManagerService;
		private final DevicePolicyManager mDevicePolicyManager;

		public AppWithAdminGrantedPermissionsCounter(Context context, String[] permissions,
		PackageManagerWrapper packageManager, IPackageManagerWrapper packageManagerService,
		PackageManagerWrapper packageManager, IPackageManager packageManagerService,
		DevicePolicyManager devicePolicyManager) {
		super(context, packageManager);
		mPermissions = permissions;
		@@ -52,7 +52,7 @@ public abstract class AppWithAdminGrantedPermissionsCounter extends AppCounter {

		public static boolean includeInCount(String[] permissions,
		DevicePolicyManager devicePolicyManager, PackageManagerWrapper packageManager,
		IPackageManagerWrapper packageManagerService, ApplicationInfo info) {
		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
		// granted by enterprise policy.

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -18,9 +18,9 @@ package com.android.settings.applications;

		import android.app.admin.DevicePolicyManager;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.IPackageManager;
		import android.os.UserManager;

		import com.android.settings.wrapper.IPackageManagerWrapper;
		import com.android.settingslib.wrapper.PackageManagerWrapper;

		/**
		@@ -29,11 +29,11 @@ import com.android.settingslib.wrapper.PackageManagerWrapper;
		*/
		public abstract class AppWithAdminGrantedPermissionsLister extends AppLister {
		private final String[] mPermissions;
		private final IPackageManagerWrapper mPackageManagerService;
		private final IPackageManager mPackageManagerService;
		private final DevicePolicyManager mDevicePolicyManager;

		public AppWithAdminGrantedPermissionsLister(String[] permissions,
		PackageManagerWrapper packageManager, IPackageManagerWrapper packageManagerService,
		PackageManagerWrapper packageManager, IPackageManager packageManagerService,
		DevicePolicyManager devicePolicyManager, UserManager userManager) {
		super(packageManager, userManager);
		mPermissions = permissions;

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.app.admin.DevicePolicyManager;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.ComponentInfo;
		import android.content.pm.IPackageManager;
		import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.content.pm.UserInfo;
		@@ -27,7 +28,6 @@ import android.os.RemoteException;
		import android.os.UserManager;
		import android.util.ArraySet;

		import com.android.settings.wrapper.IPackageManagerWrapper;
		import com.android.settingslib.wrapper.PackageManagerWrapper;

		import java.util.ArrayList;
		@@ -38,12 +38,12 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide

		private final Context mContext;
		private final PackageManagerWrapper mPm;
		private final IPackageManagerWrapper mPms;
		private final IPackageManager mPms;
		private final DevicePolicyManager mDpm;
		private final UserManager mUm;

		public ApplicationFeatureProviderImpl(Context context, PackageManagerWrapper pm,
		IPackageManagerWrapper pms, DevicePolicyManager dpm) {
		IPackageManager pms, DevicePolicyManager dpm) {
		mContext = context.getApplicationContext();
		mPm = pm;
		mPms = pms;
		@@ -149,7 +149,7 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide

		CurrentUserAndManagedProfileAppWithAdminGrantedPermissionsCounter(Context context,
		String[] permissions, PackageManagerWrapper packageManager,
		IPackageManagerWrapper packageManagerService,
		IPackageManager packageManagerService,
		DevicePolicyManager devicePolicyManager, NumberOfAppsCallback callback) {
		super(context, permissions, packageManager, packageManagerService, devicePolicyManager);
		mCallback = callback;
		@@ -181,7 +181,7 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide
		private ListOfAppsCallback mCallback;

		CurrentUserAppWithAdminGrantedPermissionsLister(String[] permissions,
		PackageManagerWrapper packageManager, IPackageManagerWrapper packageManagerService,
		PackageManagerWrapper packageManager, IPackageManager packageManagerService,
		DevicePolicyManager devicePolicyManager, UserManager userManager,
		ListOfAppsCallback callback) {
		super(permissions, packageManager, packageManagerService, devicePolicyManager,

src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.content.Intent;
		import android.content.pm.PackageManager;
		import android.content.pm.UserInfo;
		import android.content.res.Resources;
		import android.net.ConnectivityManager;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.provider.Settings;
		@@ -32,7 +33,6 @@ import android.view.View;

		import com.android.settings.R;
		import com.android.settings.vpn2.VpnUtils;
		import com.android.settings.wrapper.ConnectivityManagerWrapper;
		import com.android.settingslib.wrapper.PackageManagerWrapper;

		import java.util.Date;
		@@ -44,13 +44,13 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
		private final DevicePolicyManager mDpm;
		private final PackageManagerWrapper mPm;
		private final UserManager mUm;
		private final ConnectivityManagerWrapper mCm;
		private final ConnectivityManager mCm;
		private final Resources mResources;

		private static final int MY_USER_ID = UserHandle.myUserId();

		public EnterprisePrivacyFeatureProviderImpl(Context context, DevicePolicyManager dpm,
		PackageManagerWrapper pm, UserManager um, ConnectivityManagerWrapper cm,
		PackageManagerWrapper pm, UserManager um, ConnectivityManager cm,
		Resources resources) {
		mContext = context.getApplicationContext();
		mDpm = dpm;