diff options
author | Makoto Onuki <omakoto@google.com> | 2015-02-19 20:26:52 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-19 20:26:52 +0000 |
commit | ddd1e137585848bc58823e4f6e997ccf61b1b244 (patch) | |
tree | 5aa8d2b3c131a90033086fe2b22d1fd91b8ef9ca | |
parent | 148374fdbe3d723c7485e149afcfed314b2814e0 (diff) | |
parent | 6278612a04f0e79a30fbb4f35befeb61e9190db3 (diff) | |
download | packages_providers_ContactsProvider-ddd1e137585848bc58823e4f6e997ccf61b1b244.zip packages_providers_ContactsProvider-ddd1e137585848bc58823e4f6e997ccf61b1b244.tar.gz packages_providers_ContactsProvider-ddd1e137585848bc58823e4f6e997ccf61b1b244.tar.bz2 |
am 6278612a: am a435c434: am 463d577c: am 6522ca93: Don\'t use queryContentProviders to avoid "transaction too large" exception
* commit '6278612a04f0e79a30fbb4f35befeb61e9190db3':
Don't use queryContentProviders to avoid "transaction too large" exception
3 files changed, 22 insertions, 22 deletions
diff --git a/src/com/android/providers/contacts/ContactDirectoryManager.java b/src/com/android/providers/contacts/ContactDirectoryManager.java index f243e79..530a31b 100644 --- a/src/com/android/providers/contacts/ContactDirectoryManager.java +++ b/src/com/android/providers/contacts/ContactDirectoryManager.java @@ -199,6 +199,7 @@ public class ContactDirectoryManager { @VisibleForTesting static boolean isDirectoryProvider(ProviderInfo provider) { + if (provider == null) return false; Bundle metaData = provider.metaData; if (metaData == null) return false; @@ -213,17 +214,26 @@ public class ContactDirectoryManager { static Set<String> getDirectoryProviderPackages(PackageManager pm) { final Set<String> ret = Sets.newHashSet(); - // Note to 3rd party developers: - // queryContentProviders() is a public API but this method doesn't officially support - // the GET_META_DATA flag. Don't use it in your app. - final List<ProviderInfo> providers = pm.queryContentProviders(null, 0, - PackageManager.GET_META_DATA); - if (providers == null) { + final List<PackageInfo> packages = pm.getInstalledPackages(PackageManager.GET_PROVIDERS + | PackageManager.GET_META_DATA); + if (packages == null) { return ret; } - for (ProviderInfo provider : providers) { - if (isDirectoryProvider(provider)) { - ret.add(provider.packageName); + for (PackageInfo packageInfo : packages) { + if (DEBUG) { + Log.d(TAG, "package=" + packageInfo.packageName); + } + if (packageInfo.providers == null) { + continue; + } + for (ProviderInfo provider : packageInfo.providers) { + if (DEBUG) { + Log.d(TAG, "provider=" + provider.authority); + } + if (isDirectoryProvider(provider)) { + Log.d(TAG, "Found " + provider.authority); + ret.add(provider.packageName); + } } } if (DEBUG) { diff --git a/tests/src/com/android/providers/contacts/ContactDirectoryManagerTest.java b/tests/src/com/android/providers/contacts/ContactDirectoryManagerTest.java index be14f45..c5bc6f6 100644 --- a/tests/src/com/android/providers/contacts/ContactDirectoryManagerTest.java +++ b/tests/src/com/android/providers/contacts/ContactDirectoryManagerTest.java @@ -122,6 +122,9 @@ public class ContactDirectoryManagerTest extends BaseContactsProvider2Test { public void testIsDirectoryProvider() { ProviderInfo provider = new ProviderInfo(); + // Null -- just return false. + assertFalse(ContactDirectoryManager.isDirectoryProvider(null)); + // No metadata assertFalse(ContactDirectoryManager.isDirectoryProvider(provider)); diff --git a/tests/src/com/android/providers/contacts/ContactsMockPackageManager.java b/tests/src/com/android/providers/contacts/ContactsMockPackageManager.java index 694f0f3..a5aa7c7 100644 --- a/tests/src/com/android/providers/contacts/ContactsMockPackageManager.java +++ b/tests/src/com/android/providers/contacts/ContactsMockPackageManager.java @@ -96,17 +96,4 @@ public class ContactsMockPackageManager extends MockPackageManager { public Resources getResourcesForApplication(String appPackageName) { return new ContactsMockResources(); } - - @Override - public List<ProviderInfo> queryContentProviders(String processName, int uid, int flags) { - final List<ProviderInfo> ret = Lists.newArrayList(); - if (mPackages == null) return ret; - for (PackageInfo packageInfo : mPackages) { - if (packageInfo.providers == null) continue; - for (ProviderInfo providerInfo : packageInfo.providers) { - ret.add(providerInfo); - } - } - return ret; - } } |