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

Commit a38de276 authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Clean up fully rolled out HeadlessDeviceOwnerDelegateSecurityLoggingBugFix 

Flag was rolled out in Android V.

Bug: 335663055
Test: TH
Flag: EXEMPT flag cleanup
Change-Id: I47fc0948ba6e3dd98cb17689ddcc36ffdc69deb9
parent 6d63385f

core/java/android/app/admin/flags/flags.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -264,16 +264,6 @@ flag { 
  bug: "319084618"

}



flag {

  name: "headless_device_owner_delegate_security_logging_bug_fix"

  namespace: "enterprise"

  description: "Fix delegate security logging for single user headless DO."

  bug: "289515470"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "headless_single_user_bad_device_admin_state_fix"

  namespace: "enterprise"

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

+1 −2
Original line number Diff line number Diff line
@@ -9358,8 +9358,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 














    void sendDeviceOwnerOrProfileOwnerCommand(String action, Bundle extras, int userId) {















        if (userId == UserHandle.USER_ALL) {













            if (Flags.headlessDeviceOwnerDelegateSecurityLoggingBugFix()













                    && getHeadlessDeviceOwnerModeForDeviceOwner()













            if (getHeadlessDeviceOwnerModeForDeviceOwner()















                    == HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER) {















                userId = mOwners.getDeviceOwnerUserId();















            } else {