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

Commit 4b676ff6 authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge "Clean up fully rolled out HeadlessDeviceOwnerDelegateSecurityLoggingBugFix" into main

parents 1abd1e89 f550c553

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

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

  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 {

flag {

  name: "headless_single_user_bad_device_admin_state_fix"

  name: "headless_single_user_bad_device_admin_state_fix"

  namespace: "enterprise"

  namespace: "enterprise"

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

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










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




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








        if (userId == UserHandle.USER_ALL) {




        if (userId == UserHandle.USER_ALL) {








            if (Flags.headlessDeviceOwnerDelegateSecurityLoggingBugFix()




            if (getHeadlessDeviceOwnerModeForDeviceOwner()








                    && getHeadlessDeviceOwnerModeForDeviceOwner()










                    == HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER) {




                    == HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER) {








                userId = mOwners.getDeviceOwnerUserId();




                userId = mOwners.getDeviceOwnerUserId();








            } else {




            } else {