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

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

Merge "Deprecate canAddPrivateProfile" into main

parents 0a73d131 2600ec6c

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2682,7 +2682,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, android.Manifest.permission.QUERY_USERS}) public boolean canAddPrivateProfile();

    method @Deprecated @FlaggedApi("android.multiuser.consistent_max_users") @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS, android.Manifest.permission.QUERY_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

+3 −1
Original line number Diff line number Diff line
@@ -3434,10 +3434,12 @@ public class UserManager { 
     * class.)

     *

     * @return whether the context user can add a private profile.

     * @deprecated evaluate canAddMoreProfilesToUser(USER_TYPE_PROFILE_PRIVATE, userId) > 0 instead

     * @hide

     */

    @Deprecated

    @TestApi

    @FlaggedApi(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE)

    @FlaggedApi(android.multiuser.Flags.FLAG_CONSISTENT_MAX_USERS)

    @RequiresPermission(anyOf = {

            Manifest.permission.MANAGE_USERS,

            Manifest.permission.CREATE_USERS,