From 183cb71663320f16149d83eeebaff7795a4b55f2 Mon Sep 17 00:00:00 2001
From: linyuh <linyuh@google.com>
Date: Wed, 27 Dec 2017 17:02:37 -0800
Subject: Remove field prefixes.

Test: Existing tests
PiperOrigin-RevId: 180230450
Change-Id: I0b2589cfeeaef81e42a04efa48af24b4e4d0e95f
---
 .../android/dialer/contactphoto/ContactPhotoManager.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'java/com/android/dialer/contactphoto/ContactPhotoManager.java')

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) {
-- 
cgit v1.2.3