Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vladislav Kuzkokov
2016-09-28 21:15:06 +00:00
committed by Android (Google) Code Review
parent a7d26d9171 bbaadc0166
commit cd339f211a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -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) {