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

Commit d3278449 authored by Suprabh Shukla's avatar Suprabh Shukla
Browse files

Allowing more than one app to suspend apps 

We want to allow wellbeing apps to suspend in managed profiles.
This requires changing the internal data design of package-suspend
state to allow more than one suspending package, each with their
own parameters, namely - dialog info, app extras and launcher extras.

Also, removed the restriction of using setPackagesSuspendedAsUser when a
PO/DO exists

Test: atest com.android.server.pm.PackageUserStateTest
atest com.android.server.pm.PackageManagerSettingsTests
atest com.android.server.wm.ActivityStartInterceptorTest
atest GtsSuspendAppsTestCases

Bug: 138812320
Change-Id: If1263142fc9e6687e95af9b8d71ba8eff0c0fae9
parent b338ef16

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -11392,7 +11392,7 @@ package android.content.pm { 
    method public abstract void onPackageRemoved(String, android.os.UserHandle);

    method public abstract void onPackagesAvailable(String[], android.os.UserHandle, boolean);

    method public void onPackagesSuspended(String[], android.os.UserHandle);

    method public void onPackagesSuspended(String[], android.os.UserHandle, @Nullable android.os.Bundle);

    method @Deprecated public void onPackagesSuspended(String[], android.os.UserHandle, @Nullable android.os.Bundle);

    method public abstract void onPackagesUnavailable(String[], android.os.UserHandle, boolean);

    method public void onPackagesUnsuspended(String[], android.os.UserHandle);

    method public void onShortcutsChanged(@NonNull String, @NonNull java.util.List<android.content.pm.ShortcutInfo>, @NonNull android.os.UserHandle);

core/java/android/app/ApplicationPackageManager.java

+1 −4
Original line number Diff line number Diff line
@@ -2414,14 +2414,11 @@ public class ApplicationPackageManager extends PackageManager { 


    @Override

    public Bundle getSuspendedPackageAppExtras() {

        final PersistableBundle extras;

        try {

            extras = mPM.getSuspendedPackageAppExtras(mContext.getOpPackageName(),

                    getUserId());

            return mPM.getSuspendedPackageAppExtras(mContext.getOpPackageName(), getUserId());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

        return extras != null ? new Bundle(extras.deepCopy()) : null;

    }



    @Override

core/java/android/content/Intent.java

+0 −11
Original line number Diff line number Diff line
@@ -2024,17 +2024,6 @@ public class Intent implements Parcelable, Cloneable { 
    @SystemApi

    public static final String EXTRA_RESULT_NEEDED = "android.intent.extra.RESULT_NEEDED";



    /**

     * Intent extra: A {@link Bundle} of extras supplied for the launcher when any packages on

     * device are suspended. Will be sent with {@link #ACTION_PACKAGES_SUSPENDED}.

     *

     * @see PackageManager#isPackageSuspended()

     * @see #ACTION_PACKAGES_SUSPENDED

     *

     * @hide

     */

    public static final String EXTRA_LAUNCHER_EXTRAS = "android.intent.extra.LAUNCHER_EXTRAS";



    /**

     * Intent extra: ID of the shortcut used to send the share intent. Will be sent with

     * {@link #ACTION_SEND}.

core/java/android/content/pm/IPackageManager.aidl

+2 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.content.pm.VersionedPackage; 
import android.content.pm.dex.IArtManager;

import android.graphics.Bitmap;

import android.net.Uri;

import android.os.Bundle;

import android.os.ParcelFileDescriptor;

import android.os.PersistableBundle;

import android.content.IntentSender;
@@ -280,7 +281,7 @@ interface IPackageManager { 


    boolean isPackageSuspendedForUser(String packageName, int userId);



    PersistableBundle getSuspendedPackageAppExtras(String packageName, int userId);

    Bundle getSuspendedPackageAppExtras(String packageName, int userId);



    /**

     * Backup/restore support - only the system uid may use these.

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

+4 −0
Original line number Diff line number Diff line
@@ -248,7 +248,11 @@ public class LauncherApps { 
         *                      system, {@code null} otherwise.

         * @see PackageManager#isPackageSuspended()

         * @see #getSuspendedPackageLauncherExtras(String, UserHandle)

         * @deprecated {@code launcherExtras} should be obtained by using

         * {@link #getSuspendedPackageLauncherExtras(String, UserHandle)}. For all other cases,

         * {@link #onPackagesSuspended(String[], UserHandle)} should be used.

         */

        @Deprecated

        public void onPackagesSuspended(String[] packageNames, UserHandle user,

                @Nullable Bundle launcherExtras) {

            onPackagesSuspended(packageNames, user);