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

Commit 6f5e7a06 authored by Alex Johnston's avatar Alex Johnston Committed by Automerger Merge Worker
Browse files

Merge "Disable security and network logging COPE" into sc-dev am: 412667dd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14327552

Change-Id: I12b6b5d9508a6b265ed004971d2c24e1f3f21825
parents 515653b4 412667dd

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

+6 −0
Original line number Diff line number Diff line
@@ -883,6 +883,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                synchronized (getLockObject()) {

                    // Check whether the user is affiliated, *before* removing its data.

                    boolean isRemovedUserAffiliated = isUserAffiliatedWithDeviceLocked(userHandle);

                    if (isProfileOwnerOfOrganizationOwnedDevice(userHandle)) {

                        // Disable network and security logging

                        mInjector.securityLogSetLoggingEnabledProperty(false);

                        mSecurityLogMonitor.stop();

                        setNetworkLoggingActiveInternal(false);

                    }

                    removeUserData(userHandle);

                    if (!isRemovedUserAffiliated) {

                        // We discard the logs when unaffiliated users are deleted (so that the