summaryrefslogtreecommitdiffstats
path: root/test-runner
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-09-26 18:34:53 -0700
committerDianne Hackborn <hackbod@google.com>2010-09-27 18:05:44 -0700
commitcca1f0e3476edd09cdd81b075a6b7780a2959b46 (patch)
treed403a9351ccb722771dea382852bde6df8f23a68 /test-runner
parentc63806d852a550d82bbe6cadff8a2139d78ed559 (diff)
downloadframeworks_base-cca1f0e3476edd09cdd81b075a6b7780a2959b46.zip
frameworks_base-cca1f0e3476edd09cdd81b075a6b7780a2959b46.tar.gz
frameworks_base-cca1f0e3476edd09cdd81b075a6b7780a2959b46.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')
-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