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

Commit 2ba126cb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix javadoc for enabling backup in DevicePolicyManager"

parents eb8c06d6 508db9d0

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

+1 −1
Original line number Diff line number Diff line
@@ -9628,7 +9628,7 @@ public class DevicePolicyManager { 
     *

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

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

     */

    public void setBackupServiceEnabled(@NonNull ComponentName admin, boolean enabled) {

        throwIfParentInstance("setBackupServiceEnabled");

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+0 −4
Original line number Diff line number Diff line
@@ -12790,10 +12790,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        }

    }













    // TODO(b/22388012): When backup is available for secondary users and profiles, consider













    // whether there are any privacy/security implications of enabling the backup service here













    // if there are other users or profiles unmanaged or managed by a different entity (i.e. not













    // affiliated).















    @Override















    public void setBackupServiceEnabled(ComponentName admin, boolean enabled) {















        if (!mHasFeature) {