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

Commit 42eb74dc authored by Jason Parks's avatar Jason Parks Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when checking for user restriction sources." into main

parents 0df565f7 06573a02
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -2938,8 +2938,10 @@ public class UserManagerService extends IUserManager.Stub {
                    UserHandle.USER_NULL, UserManager.RESTRICTION_SOURCE_SYSTEM));
        }

        result.addAll(getDevicePolicyManagerInternal()
                .getUserRestrictionSources(restrictionKey, userId));
        final DevicePolicyManagerInternal dpmi = getDevicePolicyManagerInternal();
        if (dpmi != null) {
            result.addAll(dpmi.getUserRestrictionSources(restrictionKey, userId));
        }
        return result;
    }