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

Commit c5f2057d authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Gerrit Code Review
Browse files

Merge changes I28e39400,Ibada8b42 

* changes:
  UserManager restricted profile SystemApis
  Improve testing of CONNECTIVITY_ACTION broadcasts.
parents f5f4d792 81762fac

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -7510,11 +7510,13 @@ package android.os { 
  }









  public class UserManager {









    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean canHaveRestrictedProfile();









    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void clearSeedAccountData();









    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.os.UserHandle createProfile(@NonNull String, @NonNull String, @NonNull java.util.Set<java.lang.String>) throws android.os.UserManager.UserOperationException;









    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}, conditional=true) public java.util.List<android.os.UserHandle> getAllProfiles();









    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}, conditional=true) public java.util.List<android.os.UserHandle> getEnabledProfiles();









    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public android.os.UserHandle getProfileParent(@NonNull android.os.UserHandle);









    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.os.UserHandle getRestrictedProfileParent();









    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public String getSeedAccountName();









    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public android.os.PersistableBundle getSeedAccountOptions();









    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public String getSeedAccountType();
































core/java/android/os/UserManager.java



+25
−3






























Original line number
Diff line number
Diff line







@@ -1992,13 +1992,16 @@ public class UserManager {







    }



















    /**









     * Checks if specified user can have restricted profile.









     * Checks if the calling context user can have a restricted profile.









     * @return whether the context user can have a restricted profile.









     * @hide









     */









    @SystemApi









    @RequiresPermission(android.Manifest.permission.MANAGE_USERS)









    public boolean canHaveRestrictedProfile(@UserIdInt int userId) {









    @UserHandleAware









    public boolean canHaveRestrictedProfile() {









        try {









            return mService.canHaveRestrictedProfile(userId);









            return mService.canHaveRestrictedProfile(mUserId);









        } catch (RemoteException re) {









            throw re.rethrowFromSystemServer();









        }








@@ -2019,6 +2022,25 @@ public class UserManager {







        }









    }



















    /**









     * Get the parent of a restricted profile.









     *









     * @return the parent of the user or {@code null} if the user is not restricted profile









     * @hide









     */









    @SystemApi









    @RequiresPermission(anyOf = {Manifest.permission.MANAGE_USERS,









            Manifest.permission.CREATE_USERS})









    @UserHandleAware









    public @Nullable UserHandle getRestrictedProfileParent() {









        final UserInfo info = getUserInfo(mUserId);









        if (info == null) return null;









        if (!info.isRestricted()) return null;









        final int parent = info.restrictedProfileParentId;









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









        return UserHandle.of(parent);









    }



















    /**









     * Checks if a user is a guest user.









     * @return whether user is a guest user.
































services/core/java/com/android/server/connectivity/Vpn.java



+2
−1






























Original line number
Diff line number
Diff line







@@ -1229,7 +1229,8 @@ public class Vpn {







    private boolean canHaveRestrictedProfile(int userId) {









        final long token = Binder.clearCallingIdentity();









        try {









            return UserManager.get(mContext).canHaveRestrictedProfile(userId);









            final Context userContext = mContext.createContextAsUser(UserHandle.of(userId), 0);









            return userContext.getSystemService(UserManager.class).canHaveRestrictedProfile();









        } finally {









            Binder.restoreCallingIdentity(token);









        }