summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hassan Ali <hsnali@google.com> 2023-12-06 17:06:56 +0000
committer Hassan Ali <hsnali@google.com> 2023-12-08 14:32:43 +0000
commit2dfd2bce28964775ba1c7aa25879ba6c0db7edb3 (patch)
treedb88561598cd7a232ec3ff5ac97187ee640fda5c
parented082bde47e60e1347fad986af60fb890795d11a (diff)
Remove refererence from public API to flagged API
Remove refererence from public API to flagged API in DevicePolicyManager.java Test: m ds-docs-java Bug: 304996215 Change-Id: I36b30f0cd3e1435f280715bd23b4b874d1bd3e9d
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index fc3a906ced1d..91825442c8d2 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -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