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

Commit 27fd8217 authored by Lenka Trochtova's avatar Lenka Trochtova
Browse files

Hide mandatory backup's API. 

Bug: 77801801
Bug: 73750212
Bug: 64012357

Test: make RunFrameworksServicesRoboTests
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test
com.android.cts.devicepolicy.DeviceOwnerTes
cts-tradefed run cts -m CtsBackupHostTestCase

Change-Id: I7699755309b3fbff7c3fec2a06a0f409fd4087de
parent 8b0b733a

api/current.txt

+0 −3
Original line number Diff line number Diff line
@@ -6464,7 +6464,6 @@ package android.app.admin { 
    method public int getLockTaskFeatures(android.content.ComponentName);

    method public java.lang.String[] getLockTaskPackages(android.content.ComponentName);

    method public java.lang.CharSequence getLongSupportMessage(android.content.ComponentName);

    method public android.content.ComponentName getMandatoryBackupTransport();

    method public int getMaximumFailedPasswordsForWipe(android.content.ComponentName);

    method public long getMaximumTimeToLock(android.content.ComponentName);

    method public java.util.List<java.lang.String> getMeteredDataDisabledPackages(android.content.ComponentName);
@@ -6571,7 +6570,6 @@ package android.app.admin { 
    method public void setLockTaskPackages(android.content.ComponentName, java.lang.String[]) throws java.lang.SecurityException;

    method public void setLogoutEnabled(android.content.ComponentName, boolean);

    method public void setLongSupportMessage(android.content.ComponentName, java.lang.CharSequence);

    method public boolean setMandatoryBackupTransport(android.content.ComponentName, android.content.ComponentName);

    method public void setMasterVolumeMuted(android.content.ComponentName, boolean);

    method public void setMaximumFailedPasswordsForWipe(android.content.ComponentName, int);

    method public void setMaximumTimeToLock(android.content.ComponentName, long);
@@ -6732,7 +6730,6 @@ package android.app.admin { 
    field public static final int PERMISSION_POLICY_PROMPT = 0; // 0x0

    field public static final java.lang.String POLICY_DISABLE_CAMERA = "policy_disable_camera";

    field public static final java.lang.String POLICY_DISABLE_SCREEN_CAPTURE = "policy_disable_screen_capture";

    field public static final java.lang.String POLICY_MANDATORY_BACKUPS = "policy_mandatory_backups";

    field public static final int RESET_PASSWORD_DO_NOT_ASK_CREDENTIALS_ON_BOOT = 2; // 0x2

    field public static final int RESET_PASSWORD_REQUIRE_ENTRY = 1; // 0x1

    field public static final int SKIP_SETUP_WIZARD = 1; // 0x1

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

+6 −9
Original line number Diff line number Diff line
@@ -1169,6 +1169,7 @@ public class DevicePolicyManager { 
     * Constant to indicate the feature of mandatory backups. Used as argument to

     * {@link #createAdminSupportIntent(String)}.

     * @see #setMandatoryBackupTransport(ComponentName, ComponentName)

     * @hide

     */

    public static final String POLICY_MANDATORY_BACKUPS = "policy_mandatory_backups";
@@ -6843,8 +6844,7 @@ public class DevicePolicyManager { 
     * @param restriction Indicates for which feature the dialog should be displayed. Can be a

     *            user restriction from {@link UserManager}, e.g.

     *            {@link UserManager#DISALLOW_ADJUST_VOLUME}, or one of the constants

     *            {@link #POLICY_DISABLE_CAMERA}, {@link #POLICY_DISABLE_SCREEN_CAPTURE} or

     *            {@link #POLICY_MANDATORY_BACKUPS}.

     *            {@link #POLICY_DISABLE_CAMERA}, {@link #POLICY_DISABLE_SCREEN_CAPTURE}.

     * @return Intent An intent to be used to start the dialog-activity if the restriction is

     *            set by an admin, or null if the restriction does not exist or no admin set it.

     */
@@ -8791,13 +8791,6 @@ public class DevicePolicyManager { 
     *

     * <p> Backup service is off by default when device owner is present.

     *

     * <p> If backups are made mandatory by specifying a non-null mandatory backup transport using

     * the {@link DevicePolicyManager#setMandatoryBackupTransport} method, the backup service is

     * automatically enabled.

     *

     * <p> If the backup service is disabled using this method after the mandatory backup transport

     * has been set, the mandatory backup transport is cleared.

     *

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with.

     * @param enabled {@code true} to enable the backup service, {@code false} to disable it.

     * @throws SecurityException if {@code admin} is not a device owner.
@@ -8835,6 +8828,8 @@ public class DevicePolicyManager { 
     * <p>Only device owner can call this method.

     * <p>If backups were disabled and a non-null backup transport {@link ComponentName} is

     * specified, backups will be enabled.

     * <p> If the backup service is disabled after the mandatory backup transport has been set, the

     * mandatory backup transport is cleared.

     *

     * <p>NOTE: The method shouldn't be called on the main thread.

     *
@@ -8842,6 +8837,7 @@ public class DevicePolicyManager { 
     * @param backupTransportComponent The backup transport layer to be used for mandatory backups.

     * @return {@code true} if the backup transport was successfully set; {@code false} otherwise.

     * @throws SecurityException if {@code admin} is not a device owner.

     * @hide

     */

    @WorkerThread

    public boolean setMandatoryBackupTransport(
@@ -8861,6 +8857,7 @@ public class DevicePolicyManager { 
     *

     * @return a {@link ComponentName} of the backup transport layer to be used if backups are

     *         mandatory or {@code null} if backups are not mandatory.

     * @hide

     */

    public ComponentName getMandatoryBackupTransport() {

        throwIfParentInstance("getMandatoryBackupTransport");