summaryrefslogtreecommitdiffstats
path: root/test-runner
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-11-19 16:56:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-19 16:56:42 -0800
commitbe4e1c8f6f2731e61d1c9302662892007a4579b9 (patch)
treec222ab7e6b71ac93680578b77998b070c0f56893 /test-runner
parentdbc7f092f63172602596c8cdc213159ea5ff0003 (diff)
parent7b76ed693e42caea0c5f1bcbe7059c580e9cb314 (diff)
downloadframeworks_base-be4e1c8f6f2731e61d1c9302662892007a4579b9.zip
frameworks_base-be4e1c8f6f2731e61d1c9302662892007a4579b9.tar.gz
frameworks_base-be4e1c8f6f2731e61d1c9302662892007a4579b9.tar.bz2
am 7b76ed69: am e3bef7c4: Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."
* commit '7b76ed693e42caea0c5f1bcbe7059c580e9cb314': Added noop unregisterReceiver to complement existing noop registerReceiver.
Diffstat (limited to 'test-runner')
-rw-r--r--test-runner/src/android/test/IsolatedContext.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/test-runner/src/android/test/IsolatedContext.java b/test-runner/src/android/test/IsolatedContext.java
index b483b82..bc00f68 100644
--- a/test-runner/src/android/test/IsolatedContext.java
+++ b/test-runner/src/android/test/IsolatedContext.java
@@ -87,6 +87,11 @@ public class IsolatedContext extends ContextWrapper {
}
@Override
+ public void unregisterReceiver(BroadcastReceiver receiver) {
+ // Ignore
+ }
+
+ @Override
public void sendBroadcast(Intent intent) {
mBroadcastIntents.add(intent);
}