From 7b7053fed10bdbc4410a8f78e4cf4fb93323a1e8 Mon Sep 17 00:00:00 2001
From: Dmitrii Zhestilevskii <drzhest@google.com>
Date: Thu, 29 Sep 2022 13:49:10 +0000
Subject: [PATCH] Fix double wallpaper attachment (race) when it is gone

Bug: 248606999
Change-Id: Ibc015abbeef7feab976a501b3016d0a8fe656483
Test: manually. increase disconnectRunnable interval to 5s; pidof <app> | xargs kill
---
 .../com/android/server/wallpaper/WallpaperManagerService.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index d0b058b4c8f2a..e197319707e34 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -1337,6 +1337,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
                     }
                     FgThread.getHandler().removeCallbacks(mResetRunnable);
                     mContext.getMainThreadHandler().removeCallbacks(mTryToRebindRunnable);
+                    mContext.getMainThreadHandler().removeCallbacks(mDisconnectRunnable);
                 }
             }
         }