Merge "More mult-user API work." into jb-mr1-dev

1 files changed, 12 insertions, 5 deletions

diff --git a/test-runner/src/android/test/mock/MockContext.java b/test-runner/src/android/test/mock/MockContext.java
index 92c6676..9acffa3 100644
--- a/test-runner/src/android/test/mock/MockContext.java
+++ b/test-runner/src/android/test/mock/MockContext.java
@@ -285,11 +285,6 @@ public class MockContext extends Context {
     }
 
     @Override
-    public void sendBroadcastToUser(Intent intent, int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
     public void sendBroadcast(Intent intent, String receiverPermission) {
         throw new UnsupportedOperationException();
     }
@@ -308,6 +303,18 @@ public class MockContext extends Context {
     }
 
     @Override
+    public void sendBroadcastToUser(Intent intent, int userId) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void sendOrderedBroadcastToUser(Intent intent, int userId,
+            BroadcastReceiver resultReceiver, Handler scheduler,
+            int initialCode, String initialData, Bundle initialExtras) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
     public void sendStickyBroadcast(Intent intent) {
         throw new UnsupportedOperationException();
     }