diff options
| author | 2024-07-04 12:45:27 +0000 | |
|---|---|---|
| committer | 2024-07-04 12:45:27 +0000 | |
| commit | a991f43b3e64cbb58d909f023896df472c3a66ad (patch) | |
| tree | 1f808b9a94d64e757faba106492397637c2353ed | |
| parent | f3227baed1da083bd0532f05a6bb17f212576a54 (diff) | |
| parent | 545fc565576577e3201a58b3d14e5e50daa592a0 (diff) | |
Merge "Moving LauncherApps#getPrivateSpaceSettingsIntent to its own flag." into main
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/LauncherApps.java | 3 | ||||
| -rw-r--r-- | core/java/android/os/flags.aconfig | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 8e4de7a15dd6..46f426b9f8e9 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -12494,6 +12494,7 @@ package android.content.pm { method @FlaggedApi("android.os.allow_private_profile") @Nullable @RequiresPermission(conditional=true, anyOf={"android.permission.ACCESS_HIDDEN_PROFILES_FULL", android.Manifest.permission.ACCESS_HIDDEN_PROFILES}) public final android.content.pm.LauncherUserInfo getLauncherUserInfo(@NonNull android.os.UserHandle); method public android.content.pm.LauncherApps.PinItemRequest getPinItemRequest(android.content.Intent); method @FlaggedApi("android.os.allow_private_profile") @NonNull @RequiresPermission(conditional=true, anyOf={"android.permission.ACCESS_HIDDEN_PROFILES_FULL", android.Manifest.permission.ACCESS_HIDDEN_PROFILES}) public java.util.List<java.lang.String> getPreInstalledSystemPackages(@NonNull android.os.UserHandle); + method @FlaggedApi("android.os.get_private_space_settings") @Nullable @RequiresPermission(conditional=true, anyOf={"android.permission.ACCESS_HIDDEN_PROFILES_FULL", android.Manifest.permission.ACCESS_HIDDEN_PROFILES}) public android.content.IntentSender getPrivateSpaceSettingsIntent(); method @RequiresPermission(conditional=true, anyOf={"android.permission.ACCESS_HIDDEN_PROFILES_FULL", android.Manifest.permission.ACCESS_HIDDEN_PROFILES}) public java.util.List<android.os.UserHandle> getProfiles(); method public android.graphics.drawable.Drawable getShortcutBadgedIconDrawable(android.content.pm.ShortcutInfo, int); method @Nullable public android.content.IntentSender getShortcutConfigActivityIntent(@NonNull android.content.pm.LauncherActivityInfo); diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java index df27f9d4e457..52c84dc0ac5d 100644 --- a/core/java/android/content/pm/LauncherApps.java +++ b/core/java/android/content/pm/LauncherApps.java @@ -935,12 +935,11 @@ public class LauncherApps { * * @return {@link IntentSender} object which launches the Private Space Settings Activity, if * successful, null otherwise. - * @hide */ // Alternatively, a system app can access this api for private profile if they've been granted // with the {@code android.Manifest.permission#ACCESS_HIDDEN_PROFILES_FULL} permission. @Nullable - @FlaggedApi(Flags.FLAG_ALLOW_PRIVATE_PROFILE) + @FlaggedApi(Flags.FLAG_GET_PRIVATE_SPACE_SETTINGS) @RequiresPermission(conditional = true, anyOf = {ACCESS_HIDDEN_PROFILES_FULL, ACCESS_HIDDEN_PROFILES}) public IntentSender getPrivateSpaceSettingsIntent() { diff --git a/core/java/android/os/flags.aconfig b/core/java/android/os/flags.aconfig index 6458534efc9d..f026997bcc57 100644 --- a/core/java/android/os/flags.aconfig +++ b/core/java/android/os/flags.aconfig @@ -216,3 +216,11 @@ flag { description: "Allow privileged apps to call bugreport generation without enforcing user consent and delegate it to the calling app instead" bug: "324046728" } + +flag { + name: "get_private_space_settings" + namespace: "profile_experiences" + description: "Guards a new Private Profile API in LauncherApps" + bug: "346294653" + is_exported: true +} |