From 1d16dd22fbad51a74a0ea6fe85862c6c62bc5daf Mon Sep 17 00:00:00 2001 From: Olivier Nshimiye Date: Wed, 20 Mar 2024 12:51:24 +0000 Subject: Make canAddPrivateProfile a test api Bug: 290333800 Change-Id: I42ceaaf7bfaf08eeaa0aee497ae6094908e95e96 --- core/api/test-current.txt | 1 + core/java/android/os/UserManager.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/core/api/test-current.txt b/core/api/test-current.txt index bc45a76d861b..0e5bee58d580 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -2448,6 +2448,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); diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 318c2911197c..c229deded579 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -3183,6 +3183,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}, -- cgit v1.2.3-59-g8ed1b