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

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

Merge "Moving LauncherApps#getPrivateSpaceSettingsIntent to its own flag." into main

parents f3227bae 545fc565

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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);

core/java/android/content/pm/LauncherApps.java

+1 −2
Original line number Diff line number Diff line
@@ -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() {

core/java/android/os/flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -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

}