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

Commit 0786743a authored by Marzia Favaro's avatar Marzia Favaro Committed by Android (Google) Code Review
Browse files

Merge "Prevent crash if detachWallpaperLocked is called multiple times" into udc-dev

parents eb3e27a9 6e312b9b

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

+3 −1
Original line number Diff line number Diff line
@@ -945,7 +945,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
            mWindowManagerInternal.removeWindowToken(mToken, false/* removeWindows */,

                    mDisplayId);

            try {

                if (connection.mService != null) {

                    connection.mService.detach(mToken);

                }

            } catch (RemoteException e) {

                Slog.w(TAG, "connection.mService.destroy() threw a RemoteException");

            }