Merge "Cleanup dont_read_policy_definition flag" into main (cc22fa54) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/flags/flags.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -322,16 +322,6 @@ flag {
		}
		}

		flag {
		name: "dont_read_policy_definition"
		namespace: "enterprise"
		description: "Rely on <policy-key-entry> to determine policy definition and ignore <policy-definition-entry>"
		bug: "335663055"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "user_provisioning_same_state"
		namespace: "enterprise"

+4 −9

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import android.app.admin.PolicyUpdateReceiver;
		import android.app.admin.PolicyValue;
		import android.app.admin.TargetUser;
		import android.app.admin.UserRestrictionPolicyKey;
		import android.app.admin.flags.Flags;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		@@ -2100,17 +2099,13 @@ final class DevicePolicyEngine {
		String tag = parser.getName();
		switch (tag) {
		case TAG_POLICY_KEY_ENTRY:
		if (Flags.dontReadPolicyDefinition()) {
		policyDefinition = PolicyDefinition.readFromXml(parser);
		if (policyDefinition != null) {
		policyKey = policyDefinition.getPolicyKey();
		}
		} else {
		policyKey = PolicyDefinition.readPolicyKeyFromXml(parser);
		}
		break;
		case TAG_POLICY_STATE_ENTRY:
		if (Flags.dontReadPolicyDefinition() && policyDefinition == null) {
		if (policyDefinition == null) {
		Slogf.w(TAG, "Skipping policy state - unknown policy definition");
		} else {
		policyState = PolicyState.readFromXml(policyDefinition, parser);

+0 −13

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.server.devicepolicy;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.app.admin.PolicyValue;
		import android.app.admin.flags.Flags;
		import android.util.IndentingPrintWriter;

		import com.android.internal.util.XmlUtils;
		@@ -298,18 +297,6 @@ final class PolicyState<V> {
		+ (value == null ? "null" : value));
		}
		break;
		case TAG_POLICY_DEFINITION_ENTRY:
		if (Flags.dontReadPolicyDefinition()) {
		// Should be passed by the caller.
		Objects.requireNonNull(policyDefinition);
		} else {
		policyDefinition = PolicyDefinition.readFromXml(parser);
		if (policyDefinition == null) {
		Slogf.wtf(TAG, "Error Parsing TAG_POLICY_DEFINITION_ENTRY, "
		+ "PolicyDefinition is null");
		}
		}
		break;

		case TAG_RESOLVED_VALUE_ENTRY:
		if (policyDefinition == null) {