Merge "Early exit for non-inheritable policies" into main (2e352d56) · Commits · e / os / android_frameworks_base

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java

+17 −15

Original line number	Diff line number	Diff line
		@@ -403,7 +403,9 @@ final class DevicePolicyEngine {
		*/
		private <V> void applyToInheritableProfiles(PolicyDefinition<V> policyDefinition,
		EnforcingAdmin enforcingAdmin, @Nullable PolicyValue<V> value, int userId) {
		if (policyDefinition.isInheritable()) {
		if (!policyDefinition.isInheritable()) {
		return;
		}
		Binder.withCleanCallingIdentity(() -> {
		List<UserInfo> userInfos = mUserManager.getProfiles(userId);
		for (UserInfo childUserInfo : userInfos) {
		@@ -419,7 +421,6 @@ final class DevicePolicyEngine {
		}
		});
		}
		}

		/**
		* Checks if given parentUserId is direct parent of childUserId.
		@@ -1894,6 +1895,7 @@ final class DevicePolicyEngine {
		private static File getFileName() {
		return new File(Environment.getDataSystemDirectory(), DEVICE_POLICIES_XML);
		}

		private DevicePoliciesReaderWriter() {
		mFile = getFileName();
		}