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

Merge "Disable security and network logging COPE" into sc-dev

Browse Source
This commit is contained in:
Alex Johnston
2021-04-29 08:04:23 +00:00
committed by Android (Google) Code Review
parent 09ca8113f5 fc35f82082
commit 412667ddaf
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -883,6 +883,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
synchronized (getLockObject()) { synchronized (getLockObject()) {
// Check whether the user is affiliated, *before* removing its data. // Check whether the user is affiliated, *before* removing its data.
boolean isRemovedUserAffiliated = isUserAffiliatedWithDeviceLocked(userHandle); boolean isRemovedUserAffiliated = isUserAffiliatedWithDeviceLocked(userHandle);
if (isProfileOwnerOfOrganizationOwnedDevice(userHandle)) {
// Disable network and security logging
mInjector.securityLogSetLoggingEnabledProperty(false);
mSecurityLogMonitor.stop();
setNetworkLoggingActiveInternal(false);
}
removeUserData(userHandle); removeUserData(userHandle);
if (!isRemovedUserAffiliated) { if (!isRemovedUserAffiliated) {
// We discard the logs when unaffiliated users are deleted (so that the // We discard the logs when unaffiliated users are deleted (so that the