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

Commit ce9ec7f7 authored by Yan Zhu's avatar Yan Zhu
Browse files

Improve DevicePolicyManagerTest for secondary user 

Refactor the DevicePolicyManagerTest to support tests from secondary user.
Remove split system user related logic and add tests for headless system user mode's DO setup.

Bug: 137101239
Fix: 171928524
Test: atest FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest
Change-Id: I523044b9d4e0a231fed27278e39005cdca57b95b
parent 20e48ffd

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

+3 −2
Original line number Diff line number Diff line
@@ -8378,7 +8378,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 














    @Override















    public boolean hasUserSetupCompleted() {













        return hasUserSetupCompleted(UserHandle.getCallingUserId());













        return hasUserSetupCompleted(mInjector.userHandleGetCallingUserId());















    }





























    // This checks only if the Setup Wizard has run.  Since Wear devices pair before










@@ -15303,7 +15303,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













    private List<ActiveAdmin> getProfileOwnerAdminsForCurrentProfileGroup() {















        synchronized (getLockObject()) {















            final List<ActiveAdmin> admins = new ArrayList<>();













            int[] users = mUserManager.getProfileIdsWithDisabled(UserHandle.getCallingUserId());













            int[] users = mUserManager.getProfileIdsWithDisabled(













                    mInjector.userHandleGetCallingUserId());















            for (int i = 0; i < users.length; i++) {















                final ComponentName componentName = getProfileOwnerAsUser(users[i]);















                if (componentName != null) {

























services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -352,8 +352,8 @@ public class DevicePolicyManagerServiceTestable extends DevicePolicyManagerServi













        }































        @Override













        boolean userManagerIsSplitSystemUser() {













            return services.userManagerForMock.isSplitSystemUser();













        boolean userManagerIsHeadlessSystemUserMode() {













            return services.userManagerForMock.isHeadlessSystemUserMode();















        }































        @Override

































services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java



+163
−298


























File changed.
Preview size limit exceeded, changes collapsed.
























services/tests/servicestests/src/com/android/server/devicepolicy/MockSystemServices.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -421,7 +421,7 @@ public class MockSystemServices {













    }































    public static class UserManagerForMock {













        public boolean isSplitSystemUser() {













        public boolean isHeadlessSystemUserMode() {















            return false;















        }















    }