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

Commit 827347ed authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix canAddPrivateProfile @RequiresPermission" into main

parents d2192024 95ae381d

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2586,7 +2586,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 @FlaggedApi("android.os.allow_private_profile") @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) 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

+1 −2
Original line number Diff line number Diff line
@@ -3324,8 +3324,7 @@ public class UserManager { 
    @FlaggedApi(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE)

    @RequiresPermission(anyOf = {

            Manifest.permission.MANAGE_USERS,

            Manifest.permission.CREATE_USERS},

            conditional = true)

            Manifest.permission.CREATE_USERS})

    @UserHandleAware

    public boolean canAddPrivateProfile() {

        if (!android.multiuser.Flags.enablePrivateSpaceFeatures()) return false;