commit 43fd1e84de5e28639062c20d35ba7bfec8a07001
author Dmitri Plotnikov <dplotnikov@google.com> Sun Jan 09 11:29:39 2011 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Sun Jan 09 11:29:39 2011 -0800
tree 699dc6fd835859aaf37ad2f04512ab5dcb66f572
parent 8949cfe43ea13062aa3227e87907a13bd30eef20

Fixing ContactDeletionInteractionTest

Bug: 3330176
Change-Id: I6726e74440cd7cb8c16d169a97da5042f77c9463

src/com/android/contacts/ContactsApplication.java

diff --git a/src/com/android/contacts/ContactsApplication.java b/src/com/android/contacts/ContactsApplication.java
index aa1397a..8cbdfbf 100644
--- a/src/com/android/contacts/ContactsApplication.java
+++ b/src/com/android/contacts/ContactsApplication.java
@@ -17,14 +17,36 @@
 package com.android.contacts;
 
 import com.android.contacts.model.AccountTypes;
+import com.android.contacts.test.InjectedServices;
 
 import android.app.Application;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.os.StrictMode;
 import android.preference.PreferenceManager;
 
 public final class ContactsApplication extends Application {
 
+    private static InjectedServices sInjectedServices;
+
+    /**
+     * Overrides the system services with mocks for testing.
+     */
+    public static void injectContentResolver(InjectedServices services) {
+        sInjectedServices = services;
+    }
+
+    @Override
+    public ContentResolver getContentResolver() {
+        if (sInjectedServices != null) {
+            ContentResolver resolver = sInjectedServices.getContentResolver();
+            if (resolver != null) {
+                return resolver;
+            }
+        }
+        return super.getContentResolver();
+    }
+
     @Override
     public void onCreate() {
         super.onCreate();