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

Commit f81e26af authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF)
Browse files

Revert "Clean up fully rolled out HeadlessDeviceOwnerDelegateSec..." 

Revert submission 28993807-hdop-cleaup

Reason for revert: Droidmonitor created revert due to b/363275535. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:28993807-hdop-cleaup

Change-Id: If3f647d55e7cefa2fdb538168e3297aa480e377a
parent b999ca23

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

+10 −0
Original line number Diff line number Diff line
@@ -264,6 +264,16 @@ 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

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














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















        if (userId == UserHandle.USER_ALL) {













            if (getHeadlessDeviceOwnerModeForDeviceOwner()













            if (Flags.headlessDeviceOwnerDelegateSecurityLoggingBugFix()













                    && getHeadlessDeviceOwnerModeForDeviceOwner()















                    == HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER) {















                userId = mOwners.getDeviceOwnerUserId();















            } else {