Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Amith Yamasani
2012-10-30 17:40:12 -07:00
committed by Android (Google) Code Review
parent 0572827720 0c29371712
commit a07d047f34
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/WallpaperManagerService.java
View File

@@ -466,10 +466,13 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
if (Intent.ACTION_USER_REMOVED.equals(action)) { if (Intent.ACTION_USER_REMOVED.equals(action)) {
onRemoveUser(intent.getIntExtra(Intent.EXTRA_USER_HANDLE, onRemoveUser(intent.getIntExtra(Intent.EXTRA_USER_HANDLE,
UserHandle.USER_NULL)); 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); }, userFilter);