From a686345759256ab87538c6a1ada906986e215c8d Mon Sep 17 00:00:00 2001 From: Erik Wolsheimer Date: Mon, 1 May 2017 14:58:31 -0700 Subject: [PATCH] DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s Bug: 37773684 Change-Id: Ifeeb26a164c7bab59561721d10a4915ed6d9dcf3 --- .../server/wallpaper/WallpaperManagerService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index 372094001cf8f..2ea4379b1b4a1 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -592,9 +592,12 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { class WallpaperConnection extends IWallpaperConnection.Stub implements ServiceConnection { - /** Time in milliseconds until we expect the wallpaper to reconnect (unless we're in the - * middle of an update). If exceeded, the wallpaper gets reset to the system default. */ - private static final long WALLPAPER_RECONNECT_TIMEOUT_MS = 5000; + /** + * Time in milliseconds until we expect the wallpaper to reconnect (unless we're in the + * middle of an update). If exceeded, the wallpaper gets reset to the system default. + * FIXME(ewol): Adjusted from 5s to 15s for Wear. + */ + private static final long WALLPAPER_RECONNECT_TIMEOUT_MS = 15000; final WallpaperInfo mInfo; final Binder mToken = new Binder();