Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a07d047f authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Don't clean up wallpaper map entry when stopping a user." into jb-mr1-dev

parents 05728277 0c293717

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

+6 −3
Original line number Diff line number Diff line
@@ -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);