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

Commit 62c1f0fd authored by Rhed Jao's avatar Rhed Jao Committed by Automerger Merge Worker
Browse files

[RESTRICT AUTOMERGE] Fix bypass BG-FGS and BAL via package manager APIs am: 03b77aee 

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



Change-Id: I0586a3334ed8ef2670ca6ce2b5dd05fafc4f80ac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d7a206a6 03b77aee

core/java/android/content/IntentSender.java

+39 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.content; 
import android.annotation.Nullable;

import android.app.ActivityManager;

import android.app.ActivityManager.PendingIntentInfo;

import android.app.ActivityOptions;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Bundle;

import android.os.Handler;
@@ -158,7 +159,7 @@ public class IntentSender implements Parcelable { 
     */

    public void sendIntent(Context context, int code, Intent intent,

            OnFinished onFinished, Handler handler) throws SendIntentException {

        sendIntent(context, code, intent, onFinished, handler, null);

        sendIntent(context, code, intent, onFinished, handler, null, null /* options */);

    }



    /**
@@ -190,6 +191,42 @@ public class IntentSender implements Parcelable { 
    public void sendIntent(Context context, int code, Intent intent,

            OnFinished onFinished, Handler handler, String requiredPermission)

            throws SendIntentException {

        sendIntent(context, code, intent, onFinished, handler, requiredPermission,

                null /* options */);

    }



    /**

     * Perform the operation associated with this IntentSender, allowing the

     * caller to specify information about the Intent to use and be notified

     * when the send has completed.

     *

     * @param context The Context of the caller.  This may be null if

     * <var>intent</var> is also null.

     * @param code Result code to supply back to the IntentSender's target.

     * @param intent Additional Intent data.  See {@link Intent#fillIn

     * Intent.fillIn()} for information on how this is applied to the

     * original Intent.  Use null to not modify the original Intent.

     * @param onFinished The object to call back on when the send has

     * completed, or null for no callback.

     * @param handler Handler identifying the thread on which the callback

     * should happen.  If null, the callback will happen from the thread

     * pool of the process.

     * @param requiredPermission Name of permission that a recipient of the PendingIntent

     * is required to hold.  This is only valid for broadcast intents, and

     * corresponds to the permission argument in

     * {@link Context#sendBroadcast(Intent, String) Context.sendOrderedBroadcast(Intent, String)}.

     * If null, no permission is required.

     * @param options Additional options the caller would like to provide to modify the sending

     * behavior.  May be built from an {@link ActivityOptions} to apply to an activity start.

     *

     * @throws SendIntentException Throws CanceledIntentException if the IntentSender

     * is no longer allowing more intents to be sent through it.

     * @hide

     */

    public void sendIntent(Context context, int code, Intent intent,

            OnFinished onFinished, Handler handler, String requiredPermission,

            @Nullable Bundle options)

            throws SendIntentException {

        try {

            String resolvedType = intent != null ?

                    intent.resolveTypeIfNeeded(context.getContentResolver())
@@ -199,7 +236,7 @@ public class IntentSender implements Parcelable { 
                    onFinished != null

                            ? new FinishedDispatcher(this, onFinished, handler)

                            : null,

                    requiredPermission, null);

                    requiredPermission, options);

            if (res < 0) {

                throw new SendIntentException();

            }

services/core/java/com/android/server/pm/InstallPackageHelper.java

+5 −1
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ import android.annotation.Nullable; 
import android.annotation.UserIdInt;

import android.app.AppOpsManager;

import android.app.ApplicationPackageManager;

import android.app.BroadcastOptions;

import android.app.backup.IBackupManager;

import android.content.ContentResolver;

import android.content.Context;
@@ -641,7 +642,10 @@ final class InstallPackageHelper { 
        fillIn.putExtra(PackageInstaller.EXTRA_STATUS,

                PackageManager.installStatusToPublicStatus(returnCode));

        try {

            target.sendIntent(context, 0, fillIn, null, null);

            final BroadcastOptions options = BroadcastOptions.makeBasic();

            options.setPendingIntentBackgroundActivityLaunchAllowed(false);

            target.sendIntent(context, 0, fillIn, null /* onFinished*/, null /* handler */,

                    null /* requiredPermission */, options.toBundle());

        } catch (IntentSender.SendIntentException ignored) {

        }

    }

services/core/java/com/android/server/pm/PackageInstallerService.java

+9 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.annotation.Nullable; 
import android.app.ActivityManager;

import android.app.AppGlobals;

import android.app.AppOpsManager;

import android.app.BroadcastOptions;

import android.app.Notification;

import android.app.NotificationManager;

import android.app.PackageDeleteObserver;
@@ -1360,7 +1361,10 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
                    PackageInstaller.STATUS_PENDING_USER_ACTION);

            fillIn.putExtra(Intent.EXTRA_INTENT, intent);

            try {

                mTarget.sendIntent(mContext, 0, fillIn, null, null);

                final BroadcastOptions options = BroadcastOptions.makeBasic();

                options.setPendingIntentBackgroundActivityLaunchAllowed(false);

                mTarget.sendIntent(mContext, 0, fillIn, null /* onFinished*/,

                        null /* handler */, null /* requiredPermission */, options.toBundle());

            } catch (SendIntentException ignored) {

            }

        }
@@ -1385,7 +1389,10 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
                    PackageManager.deleteStatusToString(returnCode, msg));

            fillIn.putExtra(PackageInstaller.EXTRA_LEGACY_STATUS, returnCode);

            try {

                mTarget.sendIntent(mContext, 0, fillIn, null, null);

                final BroadcastOptions options = BroadcastOptions.makeBasic();

                options.setPendingIntentBackgroundActivityLaunchAllowed(false);

                mTarget.sendIntent(mContext, 0, fillIn, null /* onFinished*/,

                        null /* handler */, null /* requiredPermission */, options.toBundle());

            } catch (SendIntentException ignored) {

            }

        }

services/core/java/com/android/server/pm/PackageInstallerSession.java

+13 −3
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.WorkerThread;

import android.app.AppOpsManager;

import android.app.BroadcastOptions;

import android.app.Notification;

import android.app.NotificationManager;

import android.app.admin.DevicePolicyEventLogger;
@@ -4260,7 +4261,10 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        fillIn.putExtra(PackageInstaller.EXTRA_STATUS, PackageInstaller.STATUS_PENDING_USER_ACTION);

        fillIn.putExtra(Intent.EXTRA_INTENT, intent);

        try {

            target.sendIntent(context, 0, fillIn, null, null);

            final BroadcastOptions options = BroadcastOptions.makeBasic();

            options.setPendingIntentBackgroundActivityLaunchAllowed(false);

            target.sendIntent(context, 0, fillIn, null /* onFinished */,

                    null /* handler */, null /* requiredPermission */, options.toBundle());

        } catch (IntentSender.SendIntentException ignored) {

        }

    }
@@ -4301,7 +4305,10 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            }

        }

        try {

            target.sendIntent(context, 0, fillIn, null, null);

            final BroadcastOptions options = BroadcastOptions.makeBasic();

            options.setPendingIntentBackgroundActivityLaunchAllowed(false);

            target.sendIntent(context, 0, fillIn, null /* onFinished */,

                    null /* handler */, null /* requiredPermission */, options.toBundle());

        } catch (IntentSender.SendIntentException ignored) {

        }

    }
@@ -4335,7 +4342,10 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            intent.putExtra(PackageInstaller.EXTRA_STATUS_MESSAGE, "Staging Image Not Ready");

        }

        try {

            target.sendIntent(context, 0, intent, null, null);

            final BroadcastOptions options = BroadcastOptions.makeBasic();

            options.setPendingIntentBackgroundActivityLaunchAllowed(false);

            target.sendIntent(context, 0, intent, null /* onFinished */,

                    null /* handler */, null /* requiredPermission */, options.toBundle());

        } catch (IntentSender.SendIntentException ignored) {

        }

    }

services/core/java/com/android/server/pm/PackageManagerService.java

+6 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import android.annotation.WorkerThread; 
import android.app.ActivityManager;

import android.app.AppOpsManager;

import android.app.ApplicationPackageManager;

import android.app.BroadcastOptions;

import android.app.IActivityManager;

import android.app.admin.IDevicePolicyManager;

import android.app.admin.SecurityLog;
@@ -4770,7 +4771,11 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
                }

                if (pi != null) {

                    try {

                        pi.sendIntent(null, success ? 1 : 0, null, null, null);

                        final BroadcastOptions options = BroadcastOptions.makeBasic();

                        options.setPendingIntentBackgroundActivityLaunchAllowed(false);

                        pi.sendIntent(null, success ? 1 : 0, null /* intent */,

                                null /* onFinished*/, null /* handler */,

                                null /* requiredPermission */, options.toBundle());

                    } catch (SendIntentException e) {

                        Slog.w(TAG, e);

                    }