From 556b05a9d6f25c19a4a8bac97c75d342e1433bde Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Wed, 10 Aug 2016 15:49:24 -0700 Subject: [PATCH] Updating the javadoc of DevicePolicyManager#wipeData Updating the javadoc of DevicePolicyManager#wipedata to clarify that the calling user, if not a primary user, will get deleted Bug: 29253518 Change-Id: I84b316b1a81ebeef5aa3d802058c201f89c257b0 --- core/java/android/app/admin/DevicePolicyManager.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 3a2038fbc9de9..ac28f8017cabb 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2348,8 +2348,10 @@ public class DevicePolicyManager { public static final int WIPE_RESET_PROTECTION_DATA = 0x0002; /** - * Ask the user data be wiped. Wiping the primary user will cause the device to reboot, erasing - * all user data while next booting up. + * Ask that all user data be wiped. If called as a secondary user, the user will be removed and + * other users will remain unaffected. Calling from the primary user will cause the device to + * reboot, erasing all device data - including all the secondary users and their data - while + * booting up. *

* The calling device admin must have requested {@link DeviceAdminInfo#USES_POLICY_WIPE_DATA} to * be able to call this method; if it has not, a security exception will be thrown.