summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/ContextImpl.java
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 /core/java/android/app/ContextImpl.java
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 'core/java/android/app/ContextImpl.java')
-rw-r--r--core/java/android/app/ContextImpl.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index 77f5860..5afea13 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -1638,22 +1638,23 @@ class ContextImpl extends Context {
// ----------------------------------------------------------------------
private static final class ApplicationContentResolver extends ContentResolver {
- public ApplicationContentResolver(Context context,
- ActivityThread mainThread)
- {
+ public ApplicationContentResolver(Context context, ActivityThread mainThread) {
super(context);
mMainThread = mainThread;
}
@Override
- protected IContentProvider acquireProvider(Context context, String name)
- {
+ protected IContentProvider acquireProvider(Context context, String name) {
return mMainThread.acquireProvider(context, name);
}
@Override
- public boolean releaseProvider(IContentProvider provider)
- {
+ protected IContentProvider acquireExistingProvider(Context context, String name) {
+ return mMainThread.acquireExistingProvider(context, name);
+ }
+
+ @Override
+ public boolean releaseProvider(IContentProvider provider) {
return mMainThread.releaseProvider(provider);
}