Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8227e5b9 authored by yuemingw's avatar yuemingw
Browse files

Rename WipeDataWithReason API to wipeData. 

Bug: 71818126
Test: run cts --module DevicePolicyManager -t com.android.cts.devicepolicy.ManagedProfileTest#testWipeDataWithReason
Change-Id: I5e2e445fffeebc0d15cb312e3679181f8934fc76
parent 4140f6c4

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -6595,7 +6595,7 @@ package android.app.admin { 
    method public void uninstallCaCert(android.content.ComponentName, byte[]);

    method public void uninstallCaCert(android.content.ComponentName, byte[]);

    method public boolean updateOverrideApn(android.content.ComponentName, int, android.telephony.data.ApnSetting);

    method public boolean updateOverrideApn(android.content.ComponentName, int, android.telephony.data.ApnSetting);

    method public void wipeData(int);

    method public void wipeData(int);

    method public void wipeDataWithReason(int, java.lang.CharSequence);

    method public void wipeData(int, java.lang.CharSequence);

    field public static final java.lang.String ACTION_ADD_DEVICE_ADMIN = "android.app.action.ADD_DEVICE_ADMIN";

    field public static final java.lang.String ACTION_ADD_DEVICE_ADMIN = "android.app.action.ADD_DEVICE_ADMIN";

    field public static final java.lang.String ACTION_APPLICATION_DELEGATION_SCOPES_CHANGED = "android.app.action.APPLICATION_DELEGATION_SCOPES_CHANGED";

    field public static final java.lang.String ACTION_APPLICATION_DELEGATION_SCOPES_CHANGED = "android.app.action.APPLICATION_DELEGATION_SCOPES_CHANGED";

    field public static final java.lang.String ACTION_DEVICE_ADMIN_SERVICE = "android.app.action.DEVICE_ADMIN_SERVICE";

    field public static final java.lang.String ACTION_DEVICE_ADMIN_SERVICE = "android.app.action.DEVICE_ADMIN_SERVICE";

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -3489,18 +3489,18 @@ public class DevicePolicyManager { 
     *             that uses {@link DeviceAdminInfo#USES_POLICY_WIPE_DATA}

     *             that uses {@link DeviceAdminInfo#USES_POLICY_WIPE_DATA}

     * @throws IllegalArgumentException if the input reason string is null or empty.

     * @throws IllegalArgumentException if the input reason string is null or empty.

     */

     */

    public void wipeDataWithReason(int flags, @NonNull CharSequence reason) {

    public void wipeData(int flags, @NonNull CharSequence reason) {

        throwIfParentInstance("wipeDataWithReason");

        throwIfParentInstance("wipeData");

        Preconditions.checkNotNull(reason, "CharSequence is null");

        Preconditions.checkNotNull(reason, "CharSequence is null");

        wipeDataInternal(flags, reason.toString());

        wipeDataInternal(flags, reason.toString());

    }

    }





    /**

    /**

     * Internal function for both {@link #wipeData(int)} and

     * Internal function for both {@link #wipeData(int)} and

     * {@link #wipeDataWithReason(int, CharSequence)} to call.

     * {@link #wipeData(int, CharSequence)} to call.

     *

     *

     * @see #wipeData(int)

     * @see #wipeData(int)

     * @see #wipeDataWithReason(int, CharSequence)

     * @see #wipeData(int, CharSequence)

     * @hide

     * @hide

     */

     */

    private void wipeDataInternal(int flags, @NonNull String wipeReasonForUser) {

    private void wipeDataInternal(int flags, @NonNull String wipeReasonForUser) {