Revert "Cherrypicking flags and override methods for allowing dy..."

Revert "Required change for adding overload method for registerR..."

Revert submission 1836473-receiverChangesinAOSP

Reason for revert: <INSERT REASONING HERE>
Reverted Changes:Making build break
I906ce9eb0:Required change for adding overload method for reg...
I9a16f566c:Cherrypicking flags and override methods for allow...

Change-Id: I583a11d2a23651db24acde303d522a5faae15c6b

1 files changed, 0 insertions, 15 deletions

diff --git a/test-mock/src/android/test/mock/MockContext.java b/test-mock/src/android/test/mock/MockContext.java
index 7b449ce2ef62..6046d78240b6 100644
--- a/test-mock/src/android/test/mock/MockContext.java
+++ b/test-mock/src/android/test/mock/MockContext.java
@@ -566,26 +566,11 @@ public class MockContext extends Context {
 
     /** @hide */
     @Override
-    @SystemApi
-    public Intent registerReceiverForAllUsers(BroadcastReceiver receiver,
-            IntentFilter filter, String broadcastPermission, Handler scheduler, int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
     public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user,
             IntentFilter filter, String broadcastPermission, Handler scheduler) {
         throw new UnsupportedOperationException();
     }
 
-    /** @hide */
-    @Override
-    public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user,
-            IntentFilter filter, String broadcastPermission, Handler scheduler, int flags) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public void unregisterReceiver(BroadcastReceiver receiver) {
         throw new UnsupportedOperationException();