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

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

Revert "Properly send the reply in clearWallpaperComponentLocked" 

This reverts commit 6cc96efa.

Reason for revert: b/296928032

Change-Id: I276a5c84994f67a619402a238469de024c5b5be1
parent 6cc96efa

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

+8 −9
Original line number Diff line number Diff line
@@ -2092,8 +2092,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
                finalWhich = which;

            }



            boolean success = withCleanCallingIdentity(() -> setWallpaperComponentInternal(

                    component, callingPackage, finalWhich, userId, reply));

            boolean success = withCleanCallingIdentity(() -> setWallpaperComponent(

                    component, callingPackage, finalWhich, userId));

            if (success) return;

        } catch (IllegalArgumentException e1) {

            e = e1;
@@ -2105,13 +2105,6 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
        // wallpaper.

        Slog.e(TAG, "Default wallpaper component not found!", e);

        withCleanCallingIdentity(() -> clearWallpaperComponentLocked(wallpaper));

        if (reply != null) {

            try {

                reply.sendResult(null);

            } catch (RemoteException e1) {

                Slog.w(TAG, "Failed to notify callback after wallpaper clear", e1);

            }

        }

    }



    private void clearWallpaperLocked(int which, int userId, IRemoteCallback reply) {
@@ -3300,6 +3293,12 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
        }

    }



    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) {

        if (DEBUG) {