diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-08-19 07:55:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-19 07:56:16 -0700 |
| commit | 2284c36bfac6507be9c4361557a7e8359c319ae4 (patch) | |
| tree | 74e2c80b2e942d6d756b9d5597425641c0bed08a /services/java | |
| parent | 67645821a5c1501edac684b876e49562c70a9424 (diff) | |
| parent | ce777171fce4911f383e838d9019d84520426456 (diff) | |
| download | frameworks_base-2284c36bfac6507be9c4361557a7e8359c319ae4.zip frameworks_base-2284c36bfac6507be9c4361557a7e8359c319ae4.tar.gz frameworks_base-2284c36bfac6507be9c4361557a7e8359c319ae4.tar.bz2 | |
Merge "Fixed static wallpaper for multi-user" into jb-mr1-dev
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/WallpaperManagerService.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/services/java/com/android/server/WallpaperManagerService.java b/services/java/com/android/server/WallpaperManagerService.java index 1d248b2..afd7d0e 100644 --- a/services/java/com/android/server/WallpaperManagerService.java +++ b/services/java/com/android/server/WallpaperManagerService.java @@ -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( |