diff options
| -rw-r--r-- | src/com/android/contacts/ContactsApplication.java | 9 | ||||
| -rw-r--r-- | tests/src/com/android/contacts/activities/PeopleActivityTest.java | 3 |
2 files changed, 1 insertions, 11 deletions
diff --git a/src/com/android/contacts/ContactsApplication.java b/src/com/android/contacts/ContactsApplication.java index ff6a1aed3..eae078e3e 100644 --- a/src/com/android/contacts/ContactsApplication.java +++ b/src/com/android/contacts/ContactsApplication.java @@ -95,15 +95,6 @@ public final class ContactsApplication extends Application { } } - if (ContactPhotoManager.CONTACT_PHOTO_SERVICE.equals(name)) { - if (mContactPhotoManager == null) { - mContactPhotoManager = ContactPhotoManager.createContactPhotoManager(this); - registerComponentCallbacks(mContactPhotoManager); - mContactPhotoManager.preloadPhotosInBackground(); - } - return mContactPhotoManager; - } - return super.getSystemService(name); } diff --git a/tests/src/com/android/contacts/activities/PeopleActivityTest.java b/tests/src/com/android/contacts/activities/PeopleActivityTest.java index 0bcc2057a..bb463e877 100644 --- a/tests/src/com/android/contacts/activities/PeopleActivityTest.java +++ b/tests/src/com/android/contacts/activities/PeopleActivityTest.java @@ -90,8 +90,7 @@ public class PeopleActivityTest 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() { |