From 0c293717126b52e71eaf794394f336b5940fb349 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Tue, 30 Oct 2012 12:23:52 -0700 Subject: [PATCH] Don't clean up wallpaper map entry when stopping a user. Sometimes on quickly stopping and starting a user, a race condition causes the user entry to disappear, causing crashes in Launcher and SystemUI. Removing this step, since it doesn't really leave much residue behind. Bug: 7434849 Change-Id: Ia188602f1a79f75d307397459c2a03fadee4c722 --- .../java/com/android/server/WallpaperManagerService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/services/java/com/android/server/WallpaperManagerService.java b/services/java/com/android/server/WallpaperManagerService.java index a02fc8db5e225..82dbf54a7f70a 100644 --- a/services/java/com/android/server/WallpaperManagerService.java +++ b/services/java/com/android/server/WallpaperManagerService.java @@ -466,10 +466,13 @@ class WallpaperManagerService extends IWallpaperManager.Stub { if (Intent.ACTION_USER_REMOVED.equals(action)) { onRemoveUser(intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL)); - } else if (Intent.ACTION_USER_STOPPING.equals(action)) { - onStoppingUser(intent.getIntExtra(Intent.EXTRA_USER_HANDLE, - UserHandle.USER_NULL)); } + // TODO: Race condition causing problems when cleaning up on stopping a user. + // Comment this out for now. + // else if (Intent.ACTION_USER_STOPPING.equals(action)) { + // onStoppingUser(intent.getIntExtra(Intent.EXTRA_USER_HANDLE, + // UserHandle.USER_NULL)); + // } } }, userFilter);