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

2 files changed, 3 insertions, 13 deletions

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;
-    }
 }