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

Commit 2e609080 authored by Marzia Favaro's avatar Marzia Favaro Committed by Automerger Merge Worker
Browse files

Merge "Prevent crash if detachWallpaperLocked is called multiple times" into... 

Merge "Prevent crash if detachWallpaperLocked is called multiple times" into udc-dev am: 0786743a am: 92342833

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21651263



Change-Id: I803f9a5192603690f18119a52b406726f14a39ce
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc08f80d 92342833

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");

            }