Merge "Standardize flag usages in DevicePolicyManager" into main (4457e6e8) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DeviceAdminInfo.java

+3 −2

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

		package android.app.admin;

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

		import android.annotation.FlaggedApi;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.app.admin.flags.Flags;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.ComponentName;
		import android.content.Context;
		@@ -185,7 +186,7 @@ public final class DeviceAdminInfo implements Parcelable {
		* <p>This mode only allows a single secondary user on the device blocking the creation of
		* additional secondary users.
		*/
		@FlaggedApi(Flags.FLAG_HEADLESS_DEVICE_OWNER_SINGLE_USER_ENABLED)
		@FlaggedApi(FLAG_HEADLESS_DEVICE_OWNER_SINGLE_USER_ENABLED)
		public static final int HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER = 2;

		@IntDef({HEADLESS_DEVICE_OWNER_MODE_UNSUPPORTED, HEADLESS_DEVICE_OWNER_MODE_AFFILIATED,

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -16,13 +16,13 @@

		package android.app.admin;

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

		import android.annotation.FlaggedApi;
		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.app.admin.flags.Flags;
		import android.os.UserManager;

		import java.util.Objects;
		@@ -188,13 +188,13 @@ public final class DevicePolicyIdentifiers {
		/**
		* String identifier for {@link DevicePolicyManager#setUsbDataSignalingEnabled}.
		*/
		@FlaggedApi(Flags.FLAG_POLICY_ENGINE_MIGRATION_V2_ENABLED)
		@FlaggedApi(FLAG_POLICY_ENGINE_MIGRATION_V2_ENABLED)
		public static final String USB_DATA_SIGNALING_POLICY = "usbDataSignaling";

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

		/**

core/java/android/app/admin/DevicePolicyManager.java

+8 −6

Original line number	Diff line number	Diff line
		@@ -53,8 +53,11 @@ import static android.Manifest.permission.QUERY_ADMIN_POLICY;
		import static android.Manifest.permission.REQUEST_PASSWORD_COMPLEXITY;
		import static android.Manifest.permission.SET_TIME;
		import static android.Manifest.permission.SET_TIME_ZONE;
		import static android.app.admin.flags.Flags.FLAG_DEVICE_THEFT_API_ENABLED;
		import static android.app.admin.flags.Flags.FLAG_ESIM_MANAGEMENT_ENABLED;
		import static android.app.admin.flags.Flags.FLAG_DEVICE_POLICY_SIZE_TRACKING_ENABLED;
		import static android.app.admin.flags.Flags.FLAG_HEADLESS_DEVICE_OWNER_SINGLE_USER_ENABLED;
		import static android.app.admin.flags.Flags.FLAG_PERMISSION_MIGRATION_FOR_ZERO_TRUST_API_ENABLED;
		import static android.app.admin.flags.Flags.FLAG_SECURITY_LOG_V2_ENABLED;
		import static android.app.admin.flags.Flags.onboardingBugreportV2Enabled;
		import static android.app.admin.flags.Flags.FLAG_IS_MTE_POLICY_ENFORCED;
		@@ -90,7 +93,6 @@ import android.app.Activity;
		import android.app.IServiceConnection;
		import android.app.KeyguardManager;
		import android.app.admin.SecurityLog.SecurityEvent;
		import android.app.admin.flags.Flags;
		import android.app.compat.CompatChanges;
		import android.compat.annotation.ChangeId;
		import android.compat.annotation.EnabledSince;
		@@ -153,10 +155,10 @@ import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.infra.AndroidFuture;
		import com.android.internal.net.NetworkUtilsInternal;
		import com.android.internal.os.BackgroundThread;
		import com.android.internal.os.Zygote;
		import com.android.internal.util.ArrayUtils;
		import com.android.internal.util.Preconditions;
		import com.android.org.conscrypt.TrustedCertificateStore;
		import com.android.internal.os.Zygote;

		import java.io.ByteArrayInputStream;
		import java.io.FileNotFoundException;
		@@ -2879,7 +2881,7 @@ public class DevicePolicyManager {
		* @hide
		*/
		@SystemApi
		@FlaggedApi(Flags.FLAG_HEADLESS_DEVICE_OWNER_SINGLE_USER_ENABLED)
		@FlaggedApi(FLAG_HEADLESS_DEVICE_OWNER_SINGLE_USER_ENABLED)
		public static final int STATUS_HEADLESS_ONLY_SYSTEM_USER = 17;

		/**
		@@ -13447,7 +13449,7 @@ public class DevicePolicyManager {
		*/
		@RequiresPermission(value = MANAGE_DEVICE_POLICY_QUERY_SYSTEM_UPDATES, conditional = true)
		@SuppressLint("RequiresPermission")
		@FlaggedApi(Flags.FLAG_PERMISSION_MIGRATION_FOR_ZERO_TRUST_API_ENABLED)
		@FlaggedApi(FLAG_PERMISSION_MIGRATION_FOR_ZERO_TRUST_API_ENABLED)
		public @Nullable SystemUpdateInfo getPendingSystemUpdate(@Nullable ComponentName admin) {
		throwIfParentInstance("getPendingSystemUpdate");
		try {
		@@ -16608,7 +16610,7 @@ public class DevicePolicyManager {
		*/
		@RequiresPermission(value = MANAGE_DEVICE_POLICY_CERTIFICATES, conditional = true)
		@SuppressLint("RequiresPermission")
		@FlaggedApi(Flags.FLAG_PERMISSION_MIGRATION_FOR_ZERO_TRUST_API_ENABLED)
		@FlaggedApi(FLAG_PERMISSION_MIGRATION_FOR_ZERO_TRUST_API_ENABLED)
		@NonNull public String getEnrollmentSpecificId() {
		throwIfParentInstance("getEnrollmentSpecificId");
		if (mService == null) {
		@@ -17134,7 +17136,7 @@ public class DevicePolicyManager {
		*/
		@SystemApi
		@RequiresPermission(value = MANAGE_DEVICE_POLICY_THEFT_DETECTION)
		@FlaggedApi(Flags.FLAG_DEVICE_THEFT_API_ENABLED)
		@FlaggedApi(FLAG_DEVICE_THEFT_API_ENABLED)
		public boolean isTheftDetectionTriggered() {
		throwIfParentInstance("isTheftDetectionTriggered");
		if (mService == null) {

core/java/android/app/admin/SecurityLog.java

+3 −2

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

		package android.app.admin;

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

		import android.Manifest;
		import android.annotation.FlaggedApi;
		import android.annotation.IntDef;
		@@ -24,7 +26,6 @@ import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.app.admin.flags.Flags;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.ComponentName;
		import android.os.Build;
		@@ -610,7 +611,7 @@ public class SecurityLog {
		* <li> [2] backup service state ({@code Integer}, 1 for enabled, 0 for disabled)
		* @see DevicePolicyManager#setBackupServiceEnabled(ComponentName, boolean)
		*/
		@FlaggedApi(Flags.FLAG_BACKUP_SERVICE_SECURITY_LOG_EVENT_ENABLED)
		@FlaggedApi(FLAG_BACKUP_SERVICE_SECURITY_LOG_EVENT_ENABLED)
		public static final int TAG_BACKUP_SERVICE_TOGGLED =
		SecurityLogTags.SECURITY_BACKUP_SERVICE_TOGGLED;
		/**

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -21,8 +21,6 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_NONE;
		import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
		import static android.app.admin.WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_ALLOWLIST;
		import static android.app.admin.WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_DENYLIST;
		import static android.app.admin.flags.Flags.dumpsysPolicyEngineMigrationEnabled;
		import static android.app.admin.flags.Flags.policyEngineMigrationV2Enabled;
		import static android.net.NetworkCapabilities.NET_ENTERPRISE_ID_1;

		import static com.android.server.devicepolicy.DevicePolicyManagerService.LOG_TAG;
		@@ -41,6 +39,7 @@ import android.app.admin.PackagePolicy;
		import android.app.admin.PasswordPolicy;
		import android.app.admin.PreferentialNetworkServiceConfig;
		import android.app.admin.WifiSsidPolicy;
		import android.app.admin.flags.Flags;
		import android.graphics.Color;
		import android.net.wifi.WifiSsid;
		import android.os.Bundle;
		@@ -1297,7 +1296,7 @@ class ActiveAdmin {
		pw.print("encryptionRequested=");
		pw.println(encryptionRequested);

		if (!dumpsysPolicyEngineMigrationEnabled()) {
		if (!Flags.dumpsysPolicyEngineMigrationEnabled()) {
		pw.print("disableCamera=");
		pw.println(disableCamera);

		@@ -1316,7 +1315,8 @@ class ActiveAdmin {
		UserRestrictionsUtils.dumpRestrictions(pw, " ", userRestrictions);
		}

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