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

Commit e46ad2f3 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Automerger Merge Worker
Browse files

Merge "Add a suspension check to SuspendedAppActivity" into main am: eef74ce4 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2535480



Change-Id: I679b0ae7552da891144d77c8326503c6603d2dcf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a20e3abb eef74ce4

core/java/com/android/internal/app/SuspendedAppActivity.java

+11 −1
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ public class SuspendedAppActivity extends AlertActivity 
                // Suspension conditions were modified, dismiss any related visible dialogs.

                final String[] modified = intent.getStringArrayExtra(

                        Intent.EXTRA_CHANGED_PACKAGE_LIST);

                if (ArrayUtils.contains(modified, mSuspendedPackage)) {

                if (ArrayUtils.contains(modified, mSuspendedPackage)

                        && !isPackageSuspended(mSuspendedPackage)) {

                    if (!isFinishing()) {

                        Slog.w(TAG, "Package " + mSuspendedPackage + " has modified"

                                + " suspension conditions while dialog was visible. Finishing.");
@@ -92,6 +93,15 @@ public class SuspendedAppActivity extends AlertActivity 
        }

    };



    private boolean isPackageSuspended(String packageName) {

        try {

            return mPm.isPackageSuspended(packageName);

        } catch (PackageManager.NameNotFoundException ne) {

            Slog.e(TAG, "Package " + packageName + " not found", ne);

        }

        return false;

    }



    private CharSequence getAppLabel(String packageName) {

        try {

            return mPm.getApplicationInfoAsUser(packageName, 0, mUserId).loadLabel(mPm);