diff options
| author | 2023-12-08 15:30:20 +0000 | |
|---|---|---|
| committer | 2023-12-08 15:30:20 +0000 | |
| commit | a582c4515a4e1bb9ca54d139b892a11309c7df0d (patch) | |
| tree | 7d4ae898b0c100aae0076b97086888e51f873fdf | |
| parent | 7229564051c9cd70fca1ab707db95bc7a19a3e0f (diff) | |
| parent | 2dfd2bce28964775ba1c7aa25879ba6c0db7edb3 (diff) | |
Merge "Remove refererence from public API to flagged API" into main
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 4 |
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 1e538c52e635..90a265937082 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 |