drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7cd3e905: Merge "Drop <meta-data> support for DocumentsProviders." into klp-dev

Browse Source 
* commit '7cd3e905de4210c76efdc20a854ac8b959775b61':
  Drop <meta-data> support for DocumentsProviders.
This commit is contained in:
Jeff Sharkey
2013-10-09 14:01:11 -07:00
committed by Android Git Automerger
parent 6d1e4522e3 7cd3e905de
commit 4df901a40c
2 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/provider/DocumentsContract.java
View File

@ -23,8 +23,7 @@ import android.content.ContentProviderClient;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.ResolveInfo;
import android.content.pm.ProviderInfo;
import android.content.res.AssetFileDescriptor; import android.content.res.AssetFileDescriptor;
import android.database.Cursor; import android.database.Cursor;
import android.graphics.Bitmap; import android.graphics.Bitmap;
@ -69,10 +68,6 @@ public final class DocumentsContract {
private DocumentsContract() { private DocumentsContract() {
} }
/** {@hide} */
@Deprecated
public static final String META_DATA_DOCUMENT_PROVIDER = "android.content.DOCUMENT_PROVIDER";
/** /**
* Intent action used to identify {@link DocumentsProvider} instances. * Intent action used to identify {@link DocumentsProvider} instances.
*/ */
@ -565,12 +560,14 @@ public final class DocumentsContract {
return false; return false;
} }
final ProviderInfo info = context.getPackageManager() final Intent intent = new Intent(PROVIDER_INTERFACE);
.resolveContentProvider(uri.getAuthority(), PackageManager.GET_META_DATA); final List<ResolveInfo> infos = context.getPackageManager()
if (info != null && info.metaData != null && info.metaData.containsKey( .queryIntentContentProviders(intent, 0);
DocumentsContract.META_DATA_DOCUMENT_PROVIDER)) { for (ResolveInfo info : infos) {
if (uri.getAuthority().equals(info.providerInfo.authority)) {
return true; return true;
} }
}
return false; return false;
} }

10
packages/DocumentsUI/src/com/android/documentsui/RootsCache.java
View File

@ -194,16 +194,6 @@ public class RootsCache {
handleDocumentsProvider(info.providerInfo); handleDocumentsProvider(info.providerInfo);
} }
// Pick up legacy providers
final List<ProviderInfo> legacyProviders = pm.queryContentProviders(
null, -1, PackageManager.GET_META_DATA);
for (ProviderInfo info : legacyProviders) {
if (info.metaData != null && info.metaData.containsKey(
DocumentsContract.META_DATA_DOCUMENT_PROVIDER)) {
handleDocumentsProvider(info);
}
}
final long delta = SystemClock.elapsedRealtime() - start; final long delta = SystemClock.elapsedRealtime() - start;
Log.d(TAG, "Update found " + mTaskRoots.size() + " roots in " + delta + "ms"); Log.d(TAG, "Update found " + mTaskRoots.size() + " roots in " + delta + "ms");
synchronized (mLock) { synchronized (mLock) {