Commit 171b6d8e authored Jul 28, 2020 by Pavel Grafov

Extract ActiveAdmin and DevicePolicyData from DPMS.

And some minor changes:

* Don't check uid of admin returned by PackageManager since
it would only happen as a result of a horrible bug and looks
defensive.

* Don't check CrossUserPermission and feature flag in findAdmin
since it is only invoked from already trusted low level context
and not exposed via binder.

* Some redundant null checks.

* Inclusive language.

* Removed non-standard indentation in dupm() methods, replaced
  by newlines. Also added some missing spaces.

Test: presubmit
Bug: 162317175
Change-Id: Ib30787d5205235f33e350e0e66b390940b723bca

parent f577e3ed

services/core/java/com/android/server/pm/UserRestrictionsUtils.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -139,6 +139,11 @@ public class UserRestrictionsUtils {
		UserManager.DISALLOW_CONFIG_PRIVATE_DNS
		});

		public static final Set<String> DEPRECATED_USER_RESTRICTIONS = Sets.newArraySet(
		UserManager.DISALLOW_ADD_MANAGED_PROFILE,
		UserManager.DISALLOW_REMOVE_MANAGED_PROFILE
		);

		/**
		* Set of user restriction which we don't want to persist.
		*/