summaryrefslogtreecommitdiffstats
path: root/test-runner
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-02-06 12:04:42 -0800
committerAmith Yamasani <yamasani@google.com>2012-02-10 14:34:07 -0800
commit37ce3a8af6faab675319d0803b288ab1dddc76be (patch)
tree4619ebc854dc7c5ebe641bc915599ab6715deed9 /test-runner
parent11ca31729c05a5c82aa298fb52ddebbe08a26627 (diff)
downloadframeworks_base-37ce3a8af6faab675319d0803b288ab1dddc76be.zip
frameworks_base-37ce3a8af6faab675319d0803b288ab1dddc76be.tar.gz
frameworks_base-37ce3a8af6faab675319d0803b288ab1dddc76be.tar.bz2
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
Diffstat (limited to 'test-runner')
-rw-r--r--test-runner/src/android/test/mock/MockContext.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/test-runner/src/android/test/mock/MockContext.java b/test-runner/src/android/test/mock/MockContext.java
index 0b4fc51..674c0b7 100644
--- a/test-runner/src/android/test/mock/MockContext.java
+++ b/test-runner/src/android/test/mock/MockContext.java
@@ -333,6 +333,12 @@ public class MockContext extends Context {
throw new UnsupportedOperationException();
}
+ /** @hide */
+ @Override
+ public boolean bindService(Intent service, ServiceConnection conn, int flags, int userId) {
+ throw new UnsupportedOperationException();
+ }
+
@Override
public void unbindService(ServiceConnection conn) {
throw new UnsupportedOperationException();