summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dmitrii Zhestilevskii <drzhest@google.com> 2022-09-30 10:04:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-30 10:04:04 +0000
commita6f8ff3eb2bcbfde6180aff43ac7670305629eb8 (patch)
treed3527b2a3c1dd221a9825121627ae64e53ca8327
parentd675cedd4d9e553fe315315c7f7c0a23f3b795dc (diff)
parent4065ff1fd813e295ee294ba6a2e22f887405d69d (diff)
Merge "Fix double wallpaper attachment (race) when it is gone" am: a682d0819e am: 4065ff1fd8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2238913 Change-Id: Ifbba204d8cd887fa3e10054e73c69552ac920654 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/wallpaper/WallpaperManagerService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index d0b058b4c8f2..e197319707e3 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);
}
}
}