Merge "Remove refererence from public API to flagged API" into main (a582c451) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -16640,6 +16640,7 @@ public class DevicePolicyManager {
		== DEVICE_OWNER_TYPE_FINANCED;
		}

		// TODO(b/315298076): revert ag/25574027 and update the doc
		/**
		* Called by a device owner or profile owner of an organization-owned managed profile to enable
		* or disable USB data signaling for the device. When disabled, USB data connections
		@@ -16649,12 +16650,11 @@ public class DevicePolicyManager {
		* {@link #canUsbDataSignalingBeDisabled()} to check whether enabling or disabling USB data
		* signaling is supported on the device.
		*
		* Starting from {@link Build.VERSION_CODES#VANILLA_ICE_CREAM}, after the USB data signaling
		* Starting from Android 15, after the USB data signaling
		* policy has been set, {@link PolicyUpdateReceiver#onPolicySetResult(Context, String,
		* 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 {@link DevicePolicyIdentifiers#USB_DATA_SIGNALING_POLICY}
		* <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