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

Unverified Commit c9cb9098 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-8.1.0_r83' into staging/lineage-15.1_merge-android-security-8.1.0_r83 

Android Security 8.1.0 Release 83 (6893677)

* tag 'android-security-8.1.0_r83':
  Fix storing the wrong value of mLockdown in setting
  Backport sendBroadcastAsUserMultiplePermissions to oc-dev
  Make WallpaperMS bind wallpaper component PendingIntent immutable.

Change-Id: I0be6258c3e38731e43a735d234aaaee34f01aa6d
parents 74b19767 da1c7a38

core/java/android/app/ContextImpl.java

+16 −0
Original line number Diff line number Diff line
@@ -1008,6 +1008,22 @@ class ContextImpl extends Context { 
        }

    }



    @Override

    public void sendBroadcastAsUserMultiplePermissions(Intent intent, UserHandle user,

            String[] receiverPermissions) {

        warnIfCallingFromSystemProcess();

        String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());

        try {

            intent.prepareToLeaveProcess(this);

            ActivityManager.getService().broadcastIntent(

                    mMainThread.getApplicationThread(), intent, resolvedType, null,

                    Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE,

                    null, false, false, user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @Override

    public void sendBroadcast(Intent intent, String receiverPermission, Bundle options) {

        warnIfCallingFromSystemProcess();

core/java/android/content/Context.java

+27 −0
Original line number Diff line number Diff line
@@ -1948,6 +1948,33 @@ public abstract class Context { 
    public abstract void sendBroadcastMultiplePermissions(Intent intent,

            String[] receiverPermissions);



    /**

     * Broadcast the given intent to all interested BroadcastReceivers, allowing

     * an array of required permissions to be enforced.  This call is asynchronous; it returns

     * immediately, and you will continue executing while the receivers are run.  No results are

     * propagated from receivers and receivers can not abort the broadcast. If you want to allow

     * receivers to propagate results or abort the broadcast, you must send an ordered broadcast

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

     *

     * <p>See {@link BroadcastReceiver} for more information on Intent broadcasts.

     *

     * @param intent The Intent to broadcast; all receivers matching this

     *               Intent will receive the broadcast.

     * @param user The user to send the broadcast to.

     * @param receiverPermissions Array of names of permissions that a receiver must hold

     *                            in order to receive your broadcast.

     *                            If null or empty, no permissions are required.

     *

     * @see android.content.BroadcastReceiver

     * @see #registerReceiver

     * @see #sendBroadcast(Intent)

     * @see #sendOrderedBroadcast(Intent, String)

     * @see #sendOrderedBroadcast(Intent, String, BroadcastReceiver, Handler, int, String, Bundle)

     * @hide

     */

    public abstract void sendBroadcastAsUserMultiplePermissions(Intent intent, UserHandle user,

            String[] receiverPermissions);



    /**

     * Broadcast the given intent to all interested BroadcastReceivers, allowing

     * an optional required permission to be enforced.  This

core/java/android/content/ContextWrapper.java

+7 −0
Original line number Diff line number Diff line
@@ -448,6 +448,13 @@ public class ContextWrapper extends Context { 
        mBase.sendBroadcastMultiplePermissions(intent, receiverPermissions);

    }



    /** @hide */

    @Override

    public void sendBroadcastAsUserMultiplePermissions(Intent intent, UserHandle user,

            String[] receiverPermissions) {

        mBase.sendBroadcastAsUserMultiplePermissions(intent, user, receiverPermissions);

    }



    /** @hide */

    @SystemApi

    @Override

services/core/java/com/android/server/connectivity/Vpn.java

+1 −1
Original line number Diff line number Diff line
@@ -1138,7 +1138,7 @@ public class Vpn { 
     */

    public synchronized void onUserStopped() {

        // Switch off networking lockdown (if it was enabled)

        setLockdown(false);

        setVpnForcedLocked(false);

        mAlwaysOn = false;



        unregisterPackageChangeReceiverLocked();

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -2133,7 +2133,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { 
                    mContext, 0,

                    Intent.createChooser(new Intent(Intent.ACTION_SET_WALLPAPER),

                            mContext.getText(com.android.internal.R.string.chooser_wallpaper)),

                    0, null, new UserHandle(serviceUserId)));

                    PendingIntent.FLAG_IMMUTABLE, null, new UserHandle(serviceUserId)));

            if (!mContext.bindServiceAsUser(intent, newConn,

                    Context.BIND_AUTO_CREATE | Context.BIND_SHOWING_UI

                            | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE,