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

Commit 9fe780ee authored by Rubin Xu's avatar Rubin Xu
Browse files

Fix network logging on headless system user 

Fix the logic to retrieve the right managed profile userId.

Bug: 254834861
Test: com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest#testNetworkLoggingLogged
      com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest#testNetworkLoggingDelegate
      com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest#testNetworkLogging
      FrameworksServicesTests:DevicePolicyManagerTest
Change-Id: I077a831ef0e52e61a942f7828bcb03f96900304d
parent 5c725f9c

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

+23 −19
Original line number Diff line number Diff line
@@ -8699,21 +8699,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        }

    }













    private boolean isDeviceOwnerPackage(String packageName, int userId) {













        synchronized (getLockObject()) {













            return mOwners.hasDeviceOwner()













                    && mOwners.getDeviceOwnerUserId() == userId













                    && mOwners.getDeviceOwnerPackageName().equals(packageName);













        }













    }

























    private boolean isProfileOwnerPackage(String packageName, int userId) {













        synchronized (getLockObject()) {













            return mOwners.hasProfileOwner(userId)













                    && mOwners.getProfileOwnerPackage(userId).equals(packageName);













        }













    }



























    public boolean isProfileOwner(ComponentName who, int userId) {















        final ComponentName profileOwner = mInjector.binderWithCleanCallingIdentity(() ->















                getProfileOwnerAsUser(userId));










@@ -9264,7 +9249,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













                boolean hasProfileOwner = mOwners.hasProfileOwner(userId);















                if (!hasProfileOwner) {















                    int managedUserId = getManagedUserId(userId);













                    if (managedUserId == -1 && newState != STATE_USER_UNMANAGED) {













                    if (managedUserId < 0 && newState != STATE_USER_UNMANAGED) {















                        // No managed device, user or profile, so setting provisioning state makes















                        // no sense.















                        String error = "Not allowed to change provisioning state unless a "










@@ -12469,7 +12454,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {



























    /**















     * @return the user ID of the managed user that is linked to the current user, if any.













     * Otherwise -1.













     * Otherwise UserHandle.USER_NULL (-10000).















     */















    public int getManagedUserId(@UserIdInt int callingUserId) {















        if (VERBOSE_LOG) Slogf.v(LOG_TAG, "getManagedUserId: callingUserId=%d", callingUserId);









@@ -12482,7 +12467,26 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













            return ui.id;















        }















        if (VERBOSE_LOG)  Slogf.v(LOG_TAG, "Managed user not found.");













        return -1;













        return UserHandle.USER_NULL;













    }

























    /**













     * Returns the userId of the managed profile on the device.













     * If none exists, return {@link UserHandle#USER_NULL}.













     *













     * We assume there is only one managed profile across all users













     * on the device, which is true for now (HSUM or not) but could













     * change in future.













     */













    private @UserIdInt int getManagedUserId() {













        // On HSUM, there is only one main user and only the main user













        // can have a managed profile (for now). On non-HSUM, only user 0













        // can host the managed profile and user 0 is the main user.













        // So in both cases, we could just get the main user and













        // search for the profile user under it.













        UserHandle mainUser = mUserManager.getMainUser();













        if (mainUser == null) return UserHandle.USER_NULL;













        return getManagedUserId(mainUser.getIdentifier());















    }





























    @Override










@@ -16130,7 +16134,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













                return mOwners.getDeviceOwnerUserId();















            } else {















                return mInjector.binderWithCleanCallingIdentity(













                        () -> getManagedUserId(UserHandle.USER_SYSTEM));













                        () -> getManagedUserId());















            }















        }















    }

























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



+3
−1




























Original line number
Diff line number
Diff line








@@ -216,8 +216,10 @@ public class MockSystemServices {





























        // Add the system user with a fake profile group already set up (this can happen in the real















        // world if a managed profile is added and then removed).













        systemUserDataDir = addUser(UserHandle.USER_SYSTEM, UserInfo.FLAG_PRIMARY,













        systemUserDataDir = addUser(UserHandle.USER_SYSTEM,













                UserInfo.FLAG_PRIMARY | UserInfo.FLAG_MAIN,















                UserManager.USER_TYPE_FULL_SYSTEM, UserHandle.USER_SYSTEM);













        when(userManager.getMainUser()).thenReturn(UserHandle.SYSTEM);































        // System user is always running.















        setUserRunning(UserHandle.USER_SYSTEM, true);