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

* commit 'a07d047f34b28fdf7b3b342ceb31c8c982b24fd8':
  Don't clean up wallpaper map entry when stopping a user.

Author: Amith Yamasani

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

@@ -466,10 +466,13 @@ public void onReceive(Context context, Intent intent) {
                 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);