Fix logic in disabling BackupTransport in DO mode.

am: bbaadc0166

Change-Id: I89c0a7fb44bc50efedf2e8dc5eabaa4711b2687b
This commit is contained in:
Vladislav Kuzkokov
2016-09-28 21:26:00 +00:00
committed by android-build-merger

View File

@@ -8989,10 +8989,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) {