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

am 2284c36b: Merge "Fixed static wallpaper for multi-user" into jb-mr1-dev

Browse Source 
* commit '2284c36bfac6507be9c4361557a7e8359c319ae4':
  Fixed static wallpaper for multi-user
This commit is contained in:
Amith Yamasani
2012-08-19 07:58:33 -07:00
committed by Android Git Automerger
parent 82bb930b17 2284c36bfa
commit b3af04465d
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -768,10 +768,6 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
WallpaperConnection newConn = new WallpaperConnection(wi, wallpaper); WallpaperConnection newConn = new WallpaperConnection(wi, wallpaper);
intent.setComponent(componentName); intent.setComponent(componentName);
int serviceUserId = wallpaper.userId; 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, intent.putExtra(Intent.EXTRA_CLIENT_LABEL,
com.android.internal.R.string.wallpaper_binding_label); com.android.internal.R.string.wallpaper_binding_label);
intent.putExtra(Intent.EXTRA_CLIENT_INTENT, PendingIntent.getActivity( intent.putExtra(Intent.EXTRA_CLIENT_INTENT, PendingIntent.getActivity(