Merge "Fixed static wallpaper for multi-user" into jb-mr1-dev

This commit is contained in:
Amith Yamasani
2012-08-19 07:55:13 -07:00
committed by Android (Google) Code Review

View File

@@ -768,10 +768,6 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
WallpaperConnection newConn = new WallpaperConnection(wi, wallpaper);
intent.setComponent(componentName);
int serviceUserId = wallpaper.userId;
// Because the image wallpaper is running in the system ui
if (componentName.equals(wallpaper.imageWallpaperComponent)) {
serviceUserId = 0;
}
intent.putExtra(Intent.EXTRA_CLIENT_LABEL,
com.android.internal.R.string.wallpaper_binding_label);
intent.putExtra(Intent.EXTRA_CLIENT_INTENT, PendingIntent.getActivity(