summaryrefslogtreecommitdiffstats
path: root/test-runner
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-08-02 19:14:39 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-02 19:14:39 -0700
commit329465c6b2407ee086a171cac1a3581f83dbb048 (patch)
tree0d69eee745692b133e3f2c955561c0e09807ffb5 /test-runner
parent478923885da8fac0c1e0a8b7d85b98d1988504bc (diff)
parentb4163a6e12ee7100c758c6d3d062ade1f2843fce (diff)
downloadframeworks_base-329465c6b2407ee086a171cac1a3581f83dbb048.zip
frameworks_base-329465c6b2407ee086a171cac1a3581f83dbb048.tar.gz
frameworks_base-329465c6b2407ee086a171cac1a3581f83dbb048.tar.bz2
Merge "Add APIs for interacting across users." into jb-mr1-dev
Diffstat (limited to 'test-runner')
-rw-r--r--test-runner/src/android/test/mock/MockContext.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/test-runner/src/android/test/mock/MockContext.java b/test-runner/src/android/test/mock/MockContext.java
index bf583e1..92c6676 100644
--- a/test-runner/src/android/test/mock/MockContext.java
+++ b/test-runner/src/android/test/mock/MockContext.java
@@ -284,9 +284,8 @@ public class MockContext extends Context {
throw new UnsupportedOperationException();
}
- /** @hide */
@Override
- public void sendBroadcast(Intent intent, int userId) {
+ public void sendBroadcastToUser(Intent intent, int userId) {
throw new UnsupportedOperationException();
}