commit bfd4fb1cb5080b8bef133ba3e63b409486cd34dd
author Flavio Lerda <flerda@google.com> Fri Jul 08 11:58:55 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 08 11:58:55 2011 -0700
tree cdf794009dbcadc2a0af8872a3c279560b993323
parent 8e1dd153ff8ef752aab4fae48daa18f2dfc79ac8
parent 82e4a562b164911e045dd10f023501a9d84f127a

Merge "Fetch the contact manager from the application."

src/com/android/contacts/ContactPhotoManager.java

diff --git a/src/com/android/contacts/ContactPhotoManager.java b/src/com/android/contacts/ContactPhotoManager.java
index e61d379..fe73fbe 100644
--- a/src/com/android/contacts/ContactPhotoManager.java
+++ b/src/com/android/contacts/ContactPhotoManager.java
@@ -66,11 +66,12 @@
      * the available authenticators. This method can safely be called from the UI thread.
      */
     public static ContactPhotoManager getInstance(Context context) {
+        Context applicationContext = context.getApplicationContext();
         ContactPhotoManager service =
-                (ContactPhotoManager) context.getSystemService(CONTACT_PHOTO_SERVICE);
+                (ContactPhotoManager) applicationContext.getSystemService(CONTACT_PHOTO_SERVICE);
         if (service == null) {
-            service = createContactPhotoManager(context);
-            Log.e(TAG, "No contact photo service in context: " + context);
+            service = createContactPhotoManager(applicationContext);
+            Log.e(TAG, "No contact photo service in context: " + applicationContext);
         }
         return service;
     }