Merge "Remove wrapper for device policy manager" into pi-dev (e35e0071) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/Utils.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -94,7 +94,6 @@ import com.android.internal.app.UnlaunchableAppActivity;
		import com.android.internal.util.ArrayUtils;
		import com.android.internal.widget.LockPatternUtils;
		import com.android.settings.password.ChooseLockSettingsHelper;
		import com.android.settings.wrapper.DevicePolicyManagerWrapper;

		import java.net.InetAddress;
		import java.util.Iterator;
		@@ -874,7 +873,7 @@ public final class Utils extends com.android.settingslib.Utils {
		* @param packageName package to check about
		*/
		public static boolean isProfileOrDeviceOwner(UserManager userManager,
		DevicePolicyManagerWrapper devicePolicyManager, String packageName) {
		DevicePolicyManager devicePolicyManager, String packageName) {
		List<UserInfo> userInfos = userManager.getUsers();
		if (devicePolicyManager.isDeviceOwnerAppOnAnyUser(packageName)) {
		return true;

src/com/android/settings/accounts/RemoveAccountPreferenceController.java

+12 −24

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import android.app.Activity;
		import android.app.AlertDialog;
		import android.app.Dialog;
		import android.app.Fragment;
		import android.app.admin.DevicePolicyManager;
		import android.content.Context;
		import android.content.DialogInterface;
		import android.content.Intent;
		@@ -37,13 +36,11 @@ import android.view.View;
		import android.view.View.OnClickListener;
		import android.widget.Button;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.logging.nano.MetricsProto;
		import com.android.settings.R;
		import com.android.settings.applications.LayoutPreference;
		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
		import com.android.settings.wrapper.DevicePolicyManagerWrapper;
		import com.android.settingslib.RestrictedLockUtils;
		import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
		import com.android.settingslib.core.AbstractPreferenceController;
		@@ -58,19 +55,10 @@ public class RemoveAccountPreferenceController extends AbstractPreferenceControl
		private Account mAccount;
		private Fragment mParentFragment;
		private UserHandle mUserHandle;
		private DevicePolicyManagerWrapper mDpm;

		public RemoveAccountPreferenceController(Context context, Fragment parent) {
		this(context, parent, new DevicePolicyManagerWrapper(
		(DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE)));
		}

		@VisibleForTesting
		RemoveAccountPreferenceController(Context context, Fragment parent,
		DevicePolicyManagerWrapper dpm) {
		super(context);
		mParentFragment = parent;
		mDpm = dpm;
		}

		@Override

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

+5 −6

Original line number	Diff line number	Diff line
		@@ -47,7 +47,6 @@ import com.android.settings.applications.manageapplications.ManageApplications;
		import com.android.settings.core.SubSettingLauncher;
		import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.wrapper.DevicePolicyManagerWrapper;
		import com.android.settingslib.RestrictedLockUtils;
		import com.android.settingslib.applications.ApplicationsState;
		import com.android.settingslib.applications.ApplicationsState.AppEntry;
		@@ -75,7 +74,7 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
		protected String mPackageName;

		protected IUsbManager mUsbManager;
		protected DevicePolicyManagerWrapper mDpm;
		protected DevicePolicyManager mDpm;
		protected UserManager mUserManager;
		protected PackageManager mPm;

		@@ -94,8 +93,7 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
		.getApplicationFeatureProvider(activity);
		mState = ApplicationsState.getInstance(activity.getApplication());
		mSession = mState.newSession(this, getLifecycle());
		mDpm = new DevicePolicyManagerWrapper(
		(DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE));
		mDpm = (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
		mUserManager = (UserManager) activity.getSystemService(Context.USER_SERVICE);
		mPm = activity.getPackageManager();
		IBinder b = ServiceManager.getService(Context.USB_SERVICE);
		@@ -176,6 +174,7 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
		}

		protected abstract boolean refreshUi();

		protected abstract AlertDialog createDialog(int id, int errorCode);

		@Override

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

+4 −5

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.os.Build;
		import android.os.RemoteException;
		import android.os.UserHandle;

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

		@@ -34,11 +33,11 @@ public abstract class AppWithAdminGrantedPermissionsCounter extends AppCounter {

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

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

		public static boolean includeInCount(String[] permissions,
		DevicePolicyManagerWrapper devicePolicyManager, PackageManagerWrapper packageManager,
		DevicePolicyManager devicePolicyManager, PackageManagerWrapper packageManager,
		IPackageManagerWrapper 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

+4 −3

Original line number	Diff line number	Diff line
		@@ -16,9 +16,10 @@

		package com.android.settings.applications;

		import android.app.admin.DevicePolicyManager;
		import android.content.pm.ApplicationInfo;
		import android.os.UserManager;
		import com.android.settings.wrapper.DevicePolicyManagerWrapper;

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

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

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