From a27884236fe1eade93a124f00f0b843997b40a31 Mon Sep 17 00:00:00 2001 From: Michal Karpinski Date: Thu, 3 Nov 2016 10:19:23 +0000 Subject: Stop non-DO devices from disabling network logging Bug: 32623860 Change-Id: Ia53ce842fffb2a15c16c9535fbe07421ae7f2578 --- .../server/devicepolicy/DevicePolicyManagerService.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 6006c6bf6d3b..a156c4f968eb 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -9107,20 +9107,19 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } private synchronized void disableDeviceOwnerManagedSingleUserFeaturesIfNeeded() { + if (!mOwners.hasDeviceOwner()) { + return; + } if (!isDeviceOwnerManagedSingleUserDevice()) { mInjector.securityLogSetLoggingEnabledProperty(false); - Slog.w(LOG_TAG, "Security logging turned off as it's no longer a single user device."); getDeviceOwnerAdminLocked().isNetworkLoggingEnabled = false; saveSettingsLocked(mInjector.userHandleGetCallingUserId()); setNetworkLoggingActiveInternal(false); - Slog.w(LOG_TAG, "Network logging turned off as it's no longer a single user" - + " device."); - if (mOwners.hasDeviceOwner()) { - setBackupServiceEnabledInternal(false); - Slog.w(LOG_TAG, "Backup is off as it's a managed device that has more that one user."); - } + setBackupServiceEnabledInternal(false); + Slog.w(LOG_TAG, "Security logging, network logging and backup service turned off as" + + " it's not a single user device."); } } -- cgit v1.2.3-59-g8ed1b