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

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

Merge tag 'android-security-9.0.0_r63' into staging/lineage-16.0_merge-android-security-9.0.0_r63 

Android Security 9.0.0 Release 63 (6893678)

* tag 'android-security-9.0.0_r63':
  Fix storing the wrong value of mLockdown in setting
  Make WallpaperMS bind wallpaper component PendingIntent immutable.

Change-Id: I8ac10ede71fd4707458ddad4cf7dd44efb062b13
parents 50a20ebc 2f8631a6

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

+1 −1
Original line number Diff line number Diff line
@@ -1323,7 +1323,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
@@ -2373,7 +2373,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,