From 1d519b3deaf38e76feb9f1891cd2bd20d969e11d Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Fri, 27 Mar 2015 15:13:27 -0700 Subject: Don't return contacts photo manager as a service. It will initialize itself if it does not exist, instead of relying on getting a system service as the mechanism for initialization. Bug: 19372817 Change-Id: Iae3eff986a79730bb2a8da9dcd4f28f664719673 --- src/com/android/dialer/DialerApplication.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/com/android/dialer/DialerApplication.java b/src/com/android/dialer/DialerApplication.java index 45457c648..7bc3bb4d3 100644 --- a/src/com/android/dialer/DialerApplication.java +++ b/src/com/android/dialer/DialerApplication.java @@ -40,18 +40,4 @@ public class DialerApplication extends Application { Trace.endSection(); Trace.endSection(); } - - @Override - public Object getSystemService(String name) { - if (ContactPhotoManager.CONTACT_PHOTO_SERVICE.equals(name)) { - if (mContactPhotoManager == null) { - mContactPhotoManager = ContactPhotoManager.createContactPhotoManager(this); - registerComponentCallbacks(mContactPhotoManager); - mContactPhotoManager.preloadPhotosInBackground(); - } - return mContactPhotoManager; - } - - return super.getSystemService(name); - } } -- cgit v1.2.3