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

1 files changed, 19 insertions, 9 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) {