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

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

Merge "Add "conditional=true" annotation for setPackagesSuspended API."

parents ad3a491e f0d748be

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3907,7 +3907,7 @@ package android.content.pm { 
    method @NonNull @RequiresPermission(android.Manifest.permission.SUSPEND_APPS) public String[] setDistractingPackageRestrictions(@NonNull String[], int);

    method @RequiresPermission(android.Manifest.permission.SET_HARMFUL_APP_WARNINGS) public void setHarmfulAppWarning(@NonNull String, @Nullable CharSequence);

    method @Deprecated @Nullable @RequiresPermission(android.Manifest.permission.SUSPEND_APPS) public String[] setPackagesSuspended(@Nullable String[], boolean, @Nullable android.os.PersistableBundle, @Nullable android.os.PersistableBundle, @Nullable String);

    method @Nullable @RequiresPermission(android.Manifest.permission.SUSPEND_APPS) public String[] setPackagesSuspended(@Nullable String[], boolean, @Nullable android.os.PersistableBundle, @Nullable android.os.PersistableBundle, @Nullable android.content.pm.SuspendDialogInfo);

    method @Nullable @RequiresPermission(value=android.Manifest.permission.SUSPEND_APPS, conditional=true) public String[] setPackagesSuspended(@Nullable String[], boolean, @Nullable android.os.PersistableBundle, @Nullable android.os.PersistableBundle, @Nullable android.content.pm.SuspendDialogInfo);

    method @RequiresPermission(value=android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE, conditional=true) public void setSyntheticAppDetailsActivityEnabled(@NonNull String, boolean);

    method public void setSystemAppState(@NonNull String, int);

    method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public abstract void setUpdateAvailable(@NonNull String, boolean);

core/java/android/content/pm/PackageManager.java

+3 −2
Original line number Diff line number Diff line
@@ -9500,7 +9500,8 @@ public abstract class PackageManager { 
     * {@link PersistableBundle} objects to be shared with the apps being suspended and the

     * launcher to support customization that they might need to handle the suspended state.

     *

     * <p>The caller must hold {@link Manifest.permission#SUSPEND_APPS} to use this API.

     * <p>The caller must hold {@link Manifest.permission#SUSPEND_APPS} to use this API except for

     * device owner and profile owner.

     *

     * @param packageNames The names of the packages to set the suspended status.

     * @param suspended If set to {@code true}, the packages will be suspended, if set to
@@ -9526,7 +9527,7 @@ public abstract class PackageManager { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.SUSPEND_APPS)

    @RequiresPermission(value=Manifest.permission.SUSPEND_APPS, conditional=true)

    @Nullable

    public String[] setPackagesSuspended(@Nullable String[] packageNames, boolean suspended,

            @Nullable PersistableBundle appExtras, @Nullable PersistableBundle launcherExtras,