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

Commit 6b6fe62c authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'am-35af4edd646f40bab24ce58ec4876f71' 

* changes:
  Merge changes from topic 'am-c5d69672042b41758555eb3db8f077fe' into nyc-mr1-dev am: f6f4f1ac am: 6afa7331 am: 6b0a0835
  Merge "Change retail mode wallpaper (1/2)" into nyc-dr1-dev am: c7136b3b am: 9b2c0bf8 am: 5a08c357 am: 312eb78b
  Change retail mode wallpaper (1/2) am: 6c902d04 am: 9d0879c6 am: 3d19454e am: e4af99d6
parents e987a075 5cc93fd9

core/java/android/app/IWallpaperManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ interface IWallpaperManager { 
     */

    ParcelFileDescriptor setWallpaper(String name, in String callingPackage,

            in Rect cropHint, boolean allowBackup, out Bundle extras, int which,

            IWallpaperManagerCallback completion);

            IWallpaperManagerCallback completion, int userId);



    /**

     * Set the live wallpaper. This only affects the system wallpaper.

core/java/android/app/WallpaperManager.java

+18 −3
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import android.os.Handler; 
import android.os.IBinder;

import android.os.Looper;

import android.os.ParcelFileDescriptor;

import android.os.Process;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemProperties;
@@ -939,7 +940,8 @@ public class WallpaperManager { 
            /* Set the wallpaper to the default values */

            ParcelFileDescriptor fd = sGlobals.mService.setWallpaper(

                    "res:" + resources.getResourceName(resid),

                    mContext.getOpPackageName(), null, false, result, which, completion);

                    mContext.getOpPackageName(), null, false, result, which, completion,

                    UserHandle.myUserId());

            if (fd != null) {

                FileOutputStream fos = null;

                boolean ok = false;
@@ -1040,6 +1042,19 @@ public class WallpaperManager { 
    public int setBitmap(Bitmap fullImage, Rect visibleCropHint,

            boolean allowBackup, @SetWallpaperFlags int which)

            throws IOException {

        return setBitmap(fullImage, visibleCropHint, allowBackup, which,

                UserHandle.myUserId());

    }



    /**

     * Like {@link #setBitmap(Bitmap, Rect, boolean, int)}, but allows to pass in an explicit user

     * id. If the user id doesn't match the user id the process is running under, calling this

     * requires permission {@link android.Manifest.permission#INTERACT_ACROSS_USERS_FULL}.

     * @hide

     */

    public int setBitmap(Bitmap fullImage, Rect visibleCropHint,

            boolean allowBackup, @SetWallpaperFlags int which, int userId)

            throws IOException {

        validateRect(visibleCropHint);

        if (sGlobals.mService == null) {

            Log.w(TAG, "WallpaperService not running");
@@ -1050,7 +1065,7 @@ public class WallpaperManager { 
        try {

            ParcelFileDescriptor fd = sGlobals.mService.setWallpaper(null,

                    mContext.getOpPackageName(), visibleCropHint, allowBackup,

                    result, which, completion);

                    result, which, completion, userId);

            if (fd != null) {

                FileOutputStream fos = null;

                try {
@@ -1176,7 +1191,7 @@ public class WallpaperManager { 
        try {

            ParcelFileDescriptor fd = sGlobals.mService.setWallpaper(null,

                    mContext.getOpPackageName(), visibleCropHint, allowBackup,

                    result, which, completion);

                    result, which, completion, UserHandle.myUserId());

            if (fd != null) {

                FileOutputStream fos = null;

                try {

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

+3 −3
Original line number Diff line number Diff line
@@ -1350,7 +1350,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { 
    @Override

    public ParcelFileDescriptor setWallpaper(String name, String callingPackage,

            Rect cropHint, boolean allowBackup, Bundle extras, int which,

            IWallpaperManagerCallback completion) {

            IWallpaperManagerCallback completion, int userId) {

        userId = ActivityManager.handleIncomingUser(getCallingPid(), getCallingUid(), userId,

                false /* all */, true /* full */, "changing wallpaper", null /* pkg */);

        checkPermission(android.Manifest.permission.SET_WALLPAPER);



        if ((which & (FLAG_LOCK|FLAG_SYSTEM)) == 0) {
@@ -1374,8 +1376,6 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { 
            }

        }



        final int userId = UserHandle.getCallingUserId();



        synchronized (mLock) {

            if (DEBUG) Slog.v(TAG, "setWallpaper which=0x" + Integer.toHexString(which));

            WallpaperData wallpaper;