Merge "Documents that wipeData() is allowed for apps with MASTER_CLEAR permission." into sc-dev (6ebf3703) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DevicePolicyManager.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -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.
		*/