Skip to content

Commit 0c29371

Browse files
author
Amith Yamasani
committed
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
1 parent 4bfa1e9 commit 0c29371

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

services/java/com/android/server/WallpaperManagerService.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,13 @@ public void onReceive(Context context, Intent intent) {
466466
if (Intent.ACTION_USER_REMOVED.equals(action)) {
467467
onRemoveUser(intent.getIntExtra(Intent.EXTRA_USER_HANDLE,
468468
UserHandle.USER_NULL));
469-
} else if (Intent.ACTION_USER_STOPPING.equals(action)) {
470-
onStoppingUser(intent.getIntExtra(Intent.EXTRA_USER_HANDLE,
471-
UserHandle.USER_NULL));
472469
}
470+
// TODO: Race condition causing problems when cleaning up on stopping a user.
471+
// Comment this out for now.
472+
// else if (Intent.ACTION_USER_STOPPING.equals(action)) {
473+
// onStoppingUser(intent.getIntExtra(Intent.EXTRA_USER_HANDLE,
474+
// UserHandle.USER_NULL));
475+
// }
473476
}
474477
}, userFilter);
475478

0 commit comments

Comments
 (0)