Loading services/core/java/com/android/server/pm/UserManagerService.java +4 −2 Original line number Diff line number Diff line Loading @@ -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; } Loading Loading
services/core/java/com/android/server/pm/UserManagerService.java +4 −2 Original line number Diff line number Diff line Loading @@ -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; } Loading