diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-01-16 23:26:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-16 23:26:30 +0000 |
| commit | d4fe37bee7c7433f32c23cee100c6e05ba0f3b2b (patch) | |
| tree | 76ea7e540dfa63062ae6fa6e4920dccb40c0aa14 /test-runner/src | |
| parent | d05efe727b61e321a6c2720166988d52629c050c (diff) | |
| parent | 27b89e6658a0d233a53f5d7ca20dc57fec82d955 (diff) | |
| download | frameworks_base-d4fe37bee7c7433f32c23cee100c6e05ba0f3b2b.zip frameworks_base-d4fe37bee7c7433f32c23cee100c6e05ba0f3b2b.tar.gz frameworks_base-d4fe37bee7c7433f32c23cee100c6e05ba0f3b2b.tar.bz2 | |
Merge "Rename bindService to bindServiceAsUser to follow convention."
Diffstat (limited to 'test-runner/src')
| -rw-r--r-- | test-runner/src/android/test/mock/MockContext.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test-runner/src/android/test/mock/MockContext.java b/test-runner/src/android/test/mock/MockContext.java index 1f815e7..3097811 100644 --- a/test-runner/src/android/test/mock/MockContext.java +++ b/test-runner/src/android/test/mock/MockContext.java @@ -411,7 +411,8 @@ public class MockContext extends Context { /** @hide */ @Override - public boolean bindService(Intent service, ServiceConnection conn, int flags, int userId) { + public boolean bindServiceAsUser(Intent service, ServiceConnection conn, int flags, + UserHandle user) { throw new UnsupportedOperationException(); } |