From 37ce3a8af6faab675319d0803b288ab1dddc76be Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Mon, 6 Feb 2012 12:04:42 -0800 Subject: Multi-user - wallpaper service - Allow each user to have their own wallpaper (live or static). - Migrate old wallpaper on upgrade. - Update SystemBackupAgent to backup/restore from primary user's new wallpaper directory. Reduce dependency on Binder.getOrigCallingUser() by passing the userId for bindService. Change-Id: I19c8c3296d3d2efa7f28f951d4b84407489e2166 --- core/java/android/content/ContextWrapper.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'core/java/android/content/ContextWrapper.java') diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java index 3928aaf62d10..cd8d87f9d057 100644 --- a/core/java/android/content/ContextWrapper.java +++ b/core/java/android/content/ContextWrapper.java @@ -370,6 +370,12 @@ public class ContextWrapper extends Context { return mBase.bindService(service, conn, flags); } + /** @hide */ + @Override + public boolean bindService(Intent service, ServiceConnection conn, int flags, int userId) { + return mBase.bindService(service, conn, flags, userId); + } + @Override public void unbindService(ServiceConnection conn) { mBase.unbindService(conn); -- cgit v1.2.3