Merge "Fix Doc links in device policy manager." into main (e59b0e4d) · Commits · e / os / android_frameworks_base

api/javadoc-lint-baseline

+0 −10

Original line number	Diff line number	Diff line
		// b/305195721
		android/app/admin/DevicePolicyManager.java:2670: lint: Unresolved link/see tag "android.os.UserManager#DISALLOW_CAMERA UserManager#DISALLOW_CAMERA" in android.app.admin.DevicePolicyManager [101]
		android/app/admin/DevicePolicyManager.java:7257: lint: Unresolved link/see tag "android.app.admin.DevicePolicyIdentifiers#USB_DATA_SIGNALING_POLICY DevicePolicyIdentifiers#USB_DATA_SIGNALING_POLICY" in android.app.admin.DevicePolicyManager [101]
		android/app/admin/DevicePolicyManager.java:7425: lint: Unresolved link/see tag "ACTION_DEVICE_FINANCING_STATE_CHANGED" in android.app.admin.DevicePolicyManager [101]
		android/app/admin/DevicePolicyManager.java:7425: lint: Unresolved link/see tag "android.app.role.RoleManager#ROLE_FINANCED_DEVICE_KIOSK" in android.app.admin.DevicePolicyManager [101]
		android/app/admin/DevicePolicyManager.java:7428: lint: Unresolved link/see tag "android.app.role.RoleManager.ROLE_DEVICE_POLICY_MANAGEMENT" in android.app.admin.DevicePolicyManager [101]
		android/app/admin/DevicePolicyManager.java:8860: lint: Unresolved link/see tag "android.app.admin.DevicePolicyResources.Drawables DevicePolicyResources.Drawables" in android.app.admin.DevicePolicyManager [101]
		android/app/admin/DevicePolicyManager.java:8860: lint: Unresolved link/see tag "android.app.admin.DevicePolicyResources.Strings DevicePolicyResources.Strings" in android.app.admin.DevicePolicyManager [101]
		android/app/admin/DevicePolicyResourcesManager.java:179: lint: Unresolved link/see tag "android.app.admin.DevicePolicyResources.Strings DevicePolicyResources.Strings" in android.app.admin.DevicePolicyResourcesManager [101]

		// b/303477132
		android/app/appsearch/AppSearchSchema.java:402: lint: Unresolved link/see tag "#getIndexableNestedProperties()" in android.app.appsearch.AppSearchSchema.DocumentPropertyConfig.Builder [101]
		android/app/appsearch/AppSearchSession.java:55: lint: Unresolved link/see tag "Features#LIST_FILTER_QUERY_LANGUAGE" in android.app.appsearch.AppSearchSession [101]

core/api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -7864,6 +7864,7 @@ package android.app.admin {
		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 STATUS_BAR_DISABLED_POLICY = "statusBarDisabled";
		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/api/test-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -541,7 +541,6 @@ package android.app.admin {
		field public static final String PERMITTED_INPUT_METHODS_POLICY = "permittedInputMethods";
		field public static final String PERSONAL_APPS_SUSPENDED_POLICY = "personalAppsSuspended";
		field public static final String SCREEN_CAPTURE_DISABLED_POLICY = "screenCaptureDisabled";
		field @FlaggedApi("android.app.admin.flags.policy_engine_migration_v2_enabled") public static final String USB_DATA_SIGNALING_POLICY = "usbDataSignaling";
		}

		public class DevicePolicyManager {

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -164,11 +164,8 @@ public final class DevicePolicyIdentifiers {

		/**
		* String identifier for {@link DevicePolicyManager#setUsbDataSignalingEnabled}.
		*
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_POLICY_ENGINE_MIGRATION_V2_ENABLED)
		@TestApi
		public static final String USB_DATA_SIGNALING_POLICY = "usbDataSignaling";

		/**

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

+6 −9

Original line number	Diff line number	Diff line
		@@ -3998,8 +3998,7 @@ public class DevicePolicyManager {

		/**
		* An integer array extra for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to indicate which
		* resource IDs (see {@link DevicePolicyResources.Drawables} and
		* {@link DevicePolicyResources.Strings}) have been updated.
		* resource IDs (i.e. strings and drawables) have been updated.
		*/
		public static final String EXTRA_RESOURCE_IDS =
		"android.app.extra.RESOURCE_IDS";
		@@ -8370,9 +8369,7 @@ public class DevicePolicyManager {
		* Bundle, TargetUser, PolicyUpdateResult)} will notify the admin on whether the policy was
		* successfully set or not. This callback will contain:
		* <ul>
		* <li> The policy identifier returned from
		* {@link DevicePolicyIdentifiers#getIdentifierForUserRestriction(String)} with user restriction
		* {@link UserManager#DISALLOW_CAMERA}
		* <li> The policy identifier: userRestriction_no_camera
		* <li> The {@link TargetUser} that this policy relates to
		* <li> The {@link PolicyUpdateResult}, which will be
		* {@link PolicyUpdateResult#RESULT_POLICY_SET} if the policy was successfully set or the
		@@ -17113,19 +17110,19 @@ public class DevicePolicyManager {
		* Returns {@code true} if this device is marked as a financed device.
		*
		* <p>A financed device can be entered into lock task mode (see {@link #setLockTaskPackages})
		* by the holder of the role {@link android.app.role.RoleManager#ROLE_FINANCED_DEVICE_KIOSK}.
		* by the holder of the role {@code android.app.role.RoleManager#ROLE_FINANCED_DEVICE_KIOSK}.
		* If this occurs, Device Owners and Profile Owners that have set lock task packages or
		* features, or that attempt to set lock task packages or features, will receive a callback
		* indicating that it could not be set. See {@link PolicyUpdateReceiver#onPolicyChanged} and
		* {@link PolicyUpdateReceiver#onPolicySetResult}.
		*
		* <p>To be informed of changes to this status you can subscribe to the broadcast
		* {@link ACTION_DEVICE_FINANCING_STATE_CHANGED}.
		* {@link #ACTION_DEVICE_FINANCING_STATE_CHANGED}.
		*
		* @throws SecurityException if the caller is not a device owner, profile owner of an
		* organization-owned managed profile, profile owner on the primary user or holder of one of the
		* following roles: {@link android.app.role.RoleManager.ROLE_DEVICE_POLICY_MANAGEMENT},
		* android.app.role.RoleManager.ROLE_SYSTEM_SUPERVISION.
		* following roles: {@code android.app.role.RoleManager.ROLE_DEVICE_POLICY_MANAGEMENT},
		* {@code android.app.role.RoleManager.ROLE_SYSTEM_SUPERVISION}.
		*/
		public boolean isDeviceFinanced() {
		throwIfParentInstance("isDeviceFinanced");