summaryrefslogtreecommitdiffstats
path: root/test-runner/src
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-09-26 18:34:53 -0700
committerDianne Hackborn <hackbod@google.com>2010-09-26 21:31:47 -0700
commit8313fc7e94e46e5cc09f457a15a771a325b9f74f (patch)
treed68bf554b0d92a64cde72e58178e60d4d30b521d /test-runner/src
parent08c09b0f84b23627b4cd02e1b9a642952fbd2e7f (diff)
downloadframeworks_base-8313fc7e94e46e5cc09f457a15a771a325b9f74f.zip
frameworks_base-8313fc7e94e46e5cc09f457a15a771a325b9f74f.tar.gz
frameworks_base-8313fc7e94e46e5cc09f457a15a771a325b9f74f.tar.bz2
Allow all apps to call ContentResolver.getType().
I can't find the bug number for this, but it is needed for some things we are doing where the app building an intent may not have access to the URI in the data field. This is for HC, but doing in GB to avoid introducing integration issues. Change-Id: I0cac971854198b18775d2a73deb80f23431bfbe2
Diffstat (limited to 'test-runner/src')
-rw-r--r--test-runner/src/android/test/mock/MockContentResolver.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/test-runner/src/android/test/mock/MockContentResolver.java b/test-runner/src/android/test/mock/MockContentResolver.java
index ab511f8..26eb8e4 100644
--- a/test-runner/src/android/test/mock/MockContentResolver.java
+++ b/test-runner/src/android/test/mock/MockContentResolver.java
@@ -75,6 +75,12 @@ public class MockContentResolver extends ContentResolver {
/** @hide */
@Override
protected IContentProvider acquireProvider(Context context, String name) {
+ return acquireExistingProvider(context, name);
+ }
+
+ /** @hide */
+ @Override
+ protected IContentProvider acquireExistingProvider(Context context, String name) {
/*
* Gets the content provider from the local map