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

Commit cb50b56e authored by Aurélien Pomini's avatar Aurélien Pomini Committed by Android (Google) Code Review
Browse files

Revert "use new clearWallpaperLocked method everywhere" 

This reverts commit e78a9805.

Reason for revert: boot time regression: b/289682906

Change-Id: I2cbae4c3b5210ea1827e02ff3357b3611d62b0eb
parent e78a9805

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

+5 −18
Original line number Diff line number Diff line
@@ -1993,7 +1993,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
        WallpaperData data = null;

        synchronized (mLock) {

            if (mIsLockscreenLiveWallpaperEnabled) {

                clearWallpaperLocked(callingPackage, false, which, userId, null);

                clearWallpaperLocked(callingPackage, false, which, userId);

            } else {

                clearWallpaperLocked(false, which, userId, null);

            }
@@ -2014,7 +2014,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
    }



    private void clearWallpaperLocked(String callingPackage, boolean defaultFailed,

            int which, int userId, IRemoteCallback reply) {

            int which, int userId) {



        // Might need to bring it in the first time to establish our rewrite

        if (!mWallpaperMap.contains(userId)) {
@@ -2068,15 +2068,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
        withCleanCallingIdentity(() -> clearWallpaperComponentLocked(wallpaper));

    }



    // TODO(b/266818039) remove this version of the method

    private void clearWallpaperLocked(boolean defaultFailed, int which, int userId,

            IRemoteCallback reply) {



        if (mIsLockscreenLiveWallpaperEnabled) {

            String callingPackage = mPackageManagerInternal.getNameForUid(getCallingUid());

            clearWallpaperLocked(callingPackage, defaultFailed, which, userId, reply);

            return;

        }



        if (which != FLAG_SYSTEM && which != FLAG_LOCK) {

            throw new IllegalArgumentException("Must specify exactly one kind of wallpaper to clear");

        }
@@ -3240,21 +3234,15 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
    boolean setWallpaperComponent(ComponentName name, String callingPackage,

            @SetWallpaperFlags int which, int userId) {

        if (mIsLockscreenLiveWallpaperEnabled) {

            return setWallpaperComponentInternal(name, callingPackage, which, userId, null);

            return setWallpaperComponentInternal(name, callingPackage, which, userId);

        } else {

            setWallpaperComponentInternalLegacy(name, callingPackage, which, userId);

            return true;

        }

    }



    private boolean setWallpaperComponent(ComponentName name, @SetWallpaperFlags int which,

            int userId) {

        String callingPackage = mPackageManagerInternal.getNameForUid(getCallingUid());

        return setWallpaperComponentInternal(name, callingPackage, which, userId, null);

    }



    private boolean setWallpaperComponentInternal(ComponentName name, String callingPackage,

            @SetWallpaperFlags int which, int userIdIn, IRemoteCallback reply) {

            @SetWallpaperFlags int which, int userIdIn) {

        if (DEBUG) {

            Slog.v(TAG, "Setting new live wallpaper: which=" + which + ", component: " + name);

        }
@@ -3303,7 +3291,6 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
                            Slog.d(TAG, "publish system wallpaper changed!");

                        }

                        liveSync.complete();

                        if (reply != null) reply.sendResult(null);

                    }

                };