Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Documents that wipeData() is allowed for apps with MASTER_CLEAR permission." into sc-dev

Browse Source
This commit is contained in:
Felipe Leme
2021-04-12 20:29:04 +00:00
committed by Android (Google) Code Review
parent ce953e44cf ef5d119cd7
commit 6ebf3703f2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -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.
*/