commit f26fd6d6c6de1f75b33557c6297ee6b5a6e1c112
author Andrew Lee <anwlee@google.com> Fri Mar 27 15:12:55 2015 -0700
committer Andrew Lee <anwlee@google.com> Tue Mar 31 14:28:17 2015 -0700
tree 22b7ecd146132ef9de823a5251ea49af0d3fb22c
parent f3b9978f833056d9c56fb070ad498bfd15f8cd8b

Don't return contact photos manager as service.

Initiliaze people activity test by specifying the underlying instance
to be a MockContactPhotosManager.

Bug: 19372817
Change-Id: Ib38a7917df7d0a34e5146e71655bba1ff43a8c16

src/com/android/contacts/ContactsApplication.java

diff --git a/src/com/android/contacts/ContactsApplication.java b/src/com/android/contacts/ContactsApplication.java
index ff6a1ae..eae078e 100644
--- a/src/com/android/contacts/ContactsApplication.java
+++ b/src/com/android/contacts/ContactsApplication.java
@@ -95,15 +95,6 @@
             }
         }
 
-        if (ContactPhotoManager.CONTACT_PHOTO_SERVICE.equals(name)) {
-            if (mContactPhotoManager == null) {
-                mContactPhotoManager = ContactPhotoManager.createContactPhotoManager(this);
-                registerComponentCallbacks(mContactPhotoManager);
-                mContactPhotoManager.preloadPhotosInBackground();
-            }
-            return mContactPhotoManager;
-        }
-
         return super.getSystemService(name);
     }
 

tests/src/com/android/contacts/activities/PeopleActivityTest.java

diff --git a/tests/src/com/android/contacts/activities/PeopleActivityTest.java b/tests/src/com/android/contacts/activities/PeopleActivityTest.java
index 0bcc205..bb463e8 100644
--- a/tests/src/com/android/contacts/activities/PeopleActivityTest.java
+++ b/tests/src/com/android/contacts/activities/PeopleActivityTest.java
@@ -90,8 +90,7 @@
         InjectedServices services = new InjectedServices();
         services.setContentResolver(mContext.getContentResolver());
         services.setSharedPreferences(new MockSharedPreferences());
-        services.setSystemService(ContactPhotoManager.CONTACT_PHOTO_SERVICE,
-                new MockContactPhotoManager());
+        ContactPhotoManager.injectContactPhotoManagerForTesting(new MockContactPhotoManager());
         AccountType accountType = new BaseAccountType() {
             @Override
             public boolean areContactsWritable() {