Revert "Clean up fully rolled out PolicyEngineMigrationV2Enabled" (da953e41) · Commits · e / os / android_frameworks_base

core/api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -7964,13 +7964,13 @@ package android.app.admin {
		field public static final String LOCK_TASK_POLICY = "lockTask";
		field public static final String PACKAGES_SUSPENDED_POLICY = "packagesSuspended";
		field public static final String PACKAGE_UNINSTALL_BLOCKED_POLICY = "packageUninstallBlocked";
		field public static final String PASSWORD_COMPLEXITY_POLICY = "passwordComplexity";
		field @FlaggedApi("android.app.admin.flags.policy_engine_migration_v2_enabled") public static final String PASSWORD_COMPLEXITY_POLICY = "passwordComplexity";
		field public static final String PERMISSION_GRANT_POLICY = "permissionGrant";
		field public static final String PERSISTENT_PREFERRED_ACTIVITY_POLICY = "persistentPreferredActivity";
		field public static final String RESET_PASSWORD_TOKEN_POLICY = "resetPasswordToken";
		field public static final String SECURITY_LOGGING_POLICY = "securityLogging";
		field public static final String STATUS_BAR_DISABLED_POLICY = "statusBarDisabled";
		field public static final String USB_DATA_SIGNALING_POLICY = "usbDataSignaling";
		field @FlaggedApi("android.app.admin.flags.policy_engine_migration_v2_enabled") public static final String USB_DATA_SIGNALING_POLICY = "usbDataSignaling";
		field public static final String USER_CONTROL_DISABLED_PACKAGES_POLICY = "userControlDisabledPackages";
		}

core/java/android/app/admin/DevicePolicyIdentifiers.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.app.admin;

		import static android.app.admin.flags.Flags.FLAG_POLICY_ENGINE_MIGRATION_V2_ENABLED;

		import android.annotation.FlaggedApi;
		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		@@ -183,11 +185,13 @@ public final class DevicePolicyIdentifiers {
		/**
		* String identifier for {@link DevicePolicyManager#setUsbDataSignalingEnabled}.
		*/
		@FlaggedApi(FLAG_POLICY_ENGINE_MIGRATION_V2_ENABLED)
		public static final String USB_DATA_SIGNALING_POLICY = "usbDataSignaling";

		/**
		* String identifier for {@link DevicePolicyManager#setRequiredPasswordComplexity}.
		*/
		@FlaggedApi(FLAG_POLICY_ENGINE_MIGRATION_V2_ENABLED)
		public static final String PASSWORD_COMPLEXITY_POLICY = "passwordComplexity";

		/**

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@
		package: "android.app.admin.flags"
		container: "system"

		# Fully rolled out and must not be used.
		flag {
		name: "policy_engine_migration_v2_enabled"
		is_exported: true

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -1325,6 +1325,11 @@ class ActiveAdmin {
		pw.print("encryptionRequested=");
		pw.println(encryptionRequested);

		if (!Flags.policyEngineMigrationV2Enabled()) {
		pw.print("mUsbDataSignaling=");
		pw.println(mUsbDataSignalingEnabled);
		}

		pw.print("disableCallerId=");
		pw.println(disableCallerId);

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

+48 −13

Original line number	Diff line number	Diff line
		@@ -3679,6 +3679,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		}

		revertTransferOwnershipIfNecessaryLocked();
		if (!Flags.policyEngineMigrationV2Enabled()) {
		updateUsbDataSignal(mContext, isUsbDataSignalingEnabledInternalLocked());
		}
		}

		// Check whether work apps were paused via suspension and unsuspend if necessary.
		@@ -22425,7 +22428,17 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		Objects.requireNonNull(packageName, "Admin package name must be provided");
		final CallerIdentity caller = getCallerIdentity(packageName);

		if (!Flags.policyEngineMigrationV2Enabled()) {
		Preconditions.checkCallAuthorization(
		isDefaultDeviceOwner(caller) \|\| isProfileOwnerOfOrganizationOwnedDevice(caller),
		"USB data signaling can only be controlled by a device owner or "
		+ "a profile owner on an organization-owned device.");
		Preconditions.checkState(canUsbDataSignalingBeDisabled(),
		"USB data signaling cannot be disabled.");
		}

		synchronized (getLockObject()) {
		if (Flags.policyEngineMigrationV2Enabled()) {
		EnforcingAdmin enforcingAdmin = enforcePermissionAndGetEnforcingAdmin(
		/* admin= */ null, MANAGE_DEVICE_POLICY_USB_DATA_SIGNALLING,
		caller.getPackageName(),
		@@ -22436,6 +22449,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		PolicyDefinition.USB_DATA_SIGNALING,
		enforcingAdmin,
		new BooleanPolicyValue(enabled));
		} else {
		ActiveAdmin admin = getProfileOwnerOrDeviceOwnerLocked(caller.getUserId());
		if (admin.mUsbDataSignalingEnabled != enabled) {
		admin.mUsbDataSignalingEnabled = enabled;
		saveSettingsLocked(caller.getUserId());
		updateUsbDataSignal(mContext, isUsbDataSignalingEnabledInternalLocked());
		}
		}
		}
		DevicePolicyEventLogger
		.createEvent(DevicePolicyEnums.SET_USB_DATA_SIGNALING)
		@@ -22457,10 +22478,24 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		@Override
		public boolean isUsbDataSignalingEnabled(String packageName) {
		final CallerIdentity caller = getCallerIdentity(packageName);
		if (Flags.policyEngineMigrationV2Enabled()) {
		Boolean enabled = mDevicePolicyEngine.getResolvedPolicy(
		PolicyDefinition.USB_DATA_SIGNALING,
		caller.getUserId());
		return enabled == null \|\| enabled;
		} else {
		synchronized (getLockObject()) {
		// If the caller is an admin, return the policy set by itself. Otherwise
		// return the device-wide policy.
		if (isDefaultDeviceOwner(caller) \|\| isProfileOwnerOfOrganizationOwnedDevice(
		caller)) {
		return getProfileOwnerOrDeviceOwnerLocked(
		caller.getUserId()).mUsbDataSignalingEnabled;
		} else {
		return isUsbDataSignalingEnabledInternalLocked();
		}
		}
		}
		}

		private boolean isUsbDataSignalingEnabledInternalLocked() {