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

Commit 93ec75dd authored by Olivier Nshimiye's avatar Olivier Nshimiye Committed by Android (Google) Code Review
Browse files

Merge "Make canAddPrivateProfile a test api" into main

parents dadd7546 1d16dd22

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2460,6 +2460,7 @@ package android.os { 
  }



  public class UserManager {

    method @FlaggedApi("android.os.allow_private_profile") @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}, conditional=true) public boolean canAddPrivateProfile();

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createProfileForUser(@Nullable String, @NonNull String, int, int, @Nullable String[]);

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createRestrictedProfile(@Nullable String);

    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createUser(@Nullable String, @NonNull String, int);

core/java/android/os/UserManager.java

+2 −0
Original line number Diff line number Diff line
@@ -3188,6 +3188,8 @@ public class UserManager { 
     * @return whether the context user can add a private profile.

     * @hide

     */

    @TestApi

    @FlaggedApi(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE)

    @RequiresPermission(anyOf = {

            Manifest.permission.MANAGE_USERS,

            Manifest.permission.CREATE_USERS},