From ef5d119cd798431e727263e92743283789ae04e6 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Thu, 8 Apr 2021 13:24:07 -0700 Subject: [PATCH] Documents that wipeData() is allowed for apps with MASTER_CLEAR permission. Test: none Bug: 169779216 Change-Id: Ic1e95efe77ca5289db6993caaffd590fcc1210cd --- 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 843aa2ecb4925..621bc99c43d1b 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -5297,7 +5297,8 @@ public class DevicePolicyManager { * {@link #WIPE_EXTERNAL_STORAGE}, {@link #WIPE_RESET_PROTECTION_DATA}, * {@link #WIPE_EUICC} and {@link #WIPE_SILENTLY}. * @throws SecurityException if the calling application does not own an active administrator - * that uses {@link DeviceAdminInfo#USES_POLICY_WIPE_DATA} + * that uses {@link DeviceAdminInfo#USES_POLICY_WIPE_DATA} or is not granted the + * {@link android.Manifest.permission#MASTER_CLEAR} permission. */ public void wipeData(int flags) { wipeDataInternal(flags, ""); @@ -5325,7 +5326,8 @@ public class DevicePolicyManager { * @param reason a string that contains the reason for wiping data, which can be * presented to the user. * @throws SecurityException if the calling application does not own an active administrator - * that uses {@link DeviceAdminInfo#USES_POLICY_WIPE_DATA} + * that uses {@link DeviceAdminInfo#USES_POLICY_WIPE_DATA} or is not granted the + * {@link android.Manifest.permission#MASTER_CLEAR} permission. * @throws IllegalArgumentException if the input reason string is null or empty, or if * {@link #WIPE_SILENTLY} is set. */