summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-01-17 18:18:22 -0800
committerJeff Sharkey <jsharkey@android.com>2013-01-17 18:25:47 -0800
commit66a017b63461a22842b3678c9520f803d5ddadfc (patch)
tree07a0d63d0b362628ecbf6083aadf726d0ae02636 /api
parent54781207d31fd0fb33c6038b6999ba649fc488b2 (diff)
downloadframeworks_base-66a017b63461a22842b3678c9520f803d5ddadfc.zip
frameworks_base-66a017b63461a22842b3678c9520f803d5ddadfc.tar.gz
frameworks_base-66a017b63461a22842b3678c9520f803d5ddadfc.tar.bz2
Always give ContentResolver a valid Context.
Also add MockContentResolver constructor to provide a Context, and move to singleton ActivityThread, since there is only one inside each process. This makes ActivityThread accessible from threads like InstrumentationThread. Change-Id: Ib8b18f1b9bba8820ff412d782a43511066eabf24
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index ac367f6..d367a00 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -21512,6 +21512,7 @@ package android.test.mock {
public class MockContentResolver extends android.content.ContentResolver {
ctor public MockContentResolver();
+ ctor public MockContentResolver(android.content.Context);
method public void addProvider(java.lang.String, android.content.ContentProvider);
}