diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-12-28 02:35:07 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-28 02:35:07 +0000 |
commit | 281998c825ad48d842bb653e2f462719fdb0c1d9 (patch) | |
tree | bc8bfcce809257b3ddbb423a9808082292b9f6a3 /java/com/android/dialer/contactphoto/ContactPhotoManager.java | |
parent | fc81a030a7b4f6d4a497f71aed593d398795e7da (diff) | |
parent | 183cb71663320f16149d83eeebaff7795a4b55f2 (diff) |
Merge "Remove field prefixes."
Diffstat (limited to 'java/com/android/dialer/contactphoto/ContactPhotoManager.java')
-rw-r--r-- | java/com/android/dialer/contactphoto/ContactPhotoManager.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/java/com/android/dialer/contactphoto/ContactPhotoManager.java b/java/com/android/dialer/contactphoto/ContactPhotoManager.java index 459837936..353c1ee33 100644 --- a/java/com/android/dialer/contactphoto/ContactPhotoManager.java +++ b/java/com/android/dialer/contactphoto/ContactPhotoManager.java @@ -57,7 +57,7 @@ public abstract class ContactPhotoManager implements ComponentCallbacks2 { private static final String DEFAULT_IMAGE_URI_SCHEME = "defaultimage"; private static final Uri DEFAULT_IMAGE_URI = Uri.parse(DEFAULT_IMAGE_URI_SCHEME + "://"); public static final DefaultImageProvider DEFAULT_AVATAR = new LetterTileDefaultImageProvider(); - private static ContactPhotoManager sInstance; + private static ContactPhotoManager instance; /** * Given a {@link DefaultImageRequest}, returns an Uri that can be used to request a letter tile @@ -179,15 +179,15 @@ public abstract class ContactPhotoManager implements ComponentCallbacks2 { } public static ContactPhotoManager getInstance(Context context) { - if (sInstance == null) { + if (instance == null) { Context applicationContext = context.getApplicationContext(); - sInstance = createContactPhotoManager(applicationContext); - applicationContext.registerComponentCallbacks(sInstance); + instance = createContactPhotoManager(applicationContext); + applicationContext.registerComponentCallbacks(instance); if (PermissionsUtil.hasContactsReadPermissions(context)) { - sInstance.preloadPhotosInBackground(); + instance.preloadPhotosInBackground(); } } - return sInstance; + return instance; } public static synchronized ContactPhotoManager createContactPhotoManager(Context context) { @@ -196,7 +196,7 @@ public abstract class ContactPhotoManager implements ComponentCallbacks2 { @VisibleForTesting public static void injectContactPhotoManagerForTesting(ContactPhotoManager photoManager) { - sInstance = photoManager; + instance = photoManager; } protected boolean isDefaultImageUri(Uri uri) { |