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

Commit 85cacd79 authored by Kholoud Mohamed's avatar Kholoud Mohamed
Browse files

Fix single headless DO check on non headless devices 

Fixes: 338018090
Test: manually provisioned test DPC to DO on a phone
Change-Id: I4b0036a2d3300409b454e5cb7febd46e08131370
parent 17ba0c73

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

+3 −2
Original line number Diff line number Diff line
@@ -21610,7 +21610,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                                == HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER;

            }













            if (Flags.headlessSingleUserFixes() && isSingleUserMode && !mInjector.isChangeEnabled(













            if (Flags.headlessSingleUserFixes() && mInjector.userManagerIsHeadlessSystemUserMode()













                    && isSingleUserMode && !mInjector.isChangeEnabled(















                    PROVISION_SINGLE_USER_MODE, deviceAdmin.getPackageName(), caller.getUserId())) {















                throw new IllegalStateException("Device admin is not targeting Android V.");















            }









@@ -21629,7 +21630,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













            setLocale(provisioningParams.getLocale());





























            int deviceOwnerUserId = Flags.headlessDeviceOwnerSingleUserEnabled()













                    && isSingleUserMode













                    && isSingleUserMode && mInjector.userManagerIsHeadlessSystemUserMode()















                    ? mUserManagerInternal.getMainUserId() : UserHandle.USER_SYSTEM;





























            if (!removeNonRequiredAppsForManagedDevice(