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

Commit cd339f21 authored by Vladislav Kuzkokov's avatar Vladislav Kuzkokov Committed by Android (Google) Code Review
Browse files

Merge "Fix logic in disabling BackupTransport in DO mode." into nyc-mr1-dev

parents a7d26d91 bbaadc01

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -8987,10 +8987,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        if (!isDeviceOwnerManagedSingleUserDevice()) {

        if (!isDeviceOwnerManagedSingleUserDevice()) {

            mInjector.securityLogSetLoggingEnabledProperty(false);

            mInjector.securityLogSetLoggingEnabledProperty(false);

            Slog.w(LOG_TAG, "Security logging turned off as it's no longer a single user device.");

            Slog.w(LOG_TAG, "Security logging turned off as it's no longer a single user device.");

            if (mOwners.hasDeviceOwner()) {

                setBackupServiceEnabledInternal(false);

                setBackupServiceEnabledInternal(false);

                Slog.w(LOG_TAG, "Backup is off as it's a managed device that has more that one user.");

                Slog.w(LOG_TAG, "Backup is off as it's a managed device that has more that one user.");

            }

            }

        }

        }

    }





    @Override

    @Override

    public void setSecurityLoggingEnabled(ComponentName admin, boolean enabled) {

    public void setSecurityLoggingEnabled(ComponentName admin, boolean enabled) {