From 183cb71663320f16149d83eeebaff7795a4b55f2 Mon Sep 17 00:00:00 2001 From: linyuh Date: Wed, 27 Dec 2017 17:02:37 -0800 Subject: Remove field prefixes. Test: Existing tests PiperOrigin-RevId: 180230450 Change-Id: I0b2589cfeeaef81e42a04efa48af24b4e4d0e95f --- java/com/android/dialer/location/CountryDetector.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'java/com/android/dialer/location') diff --git a/java/com/android/dialer/location/CountryDetector.java b/java/com/android/dialer/location/CountryDetector.java index 110cf4502..5c5ed9c84 100644 --- a/java/com/android/dialer/location/CountryDetector.java +++ b/java/com/android/dialer/location/CountryDetector.java @@ -72,7 +72,7 @@ public class CountryDetector { // exceedingly rare event that the device does not have a default locale set for some reason. private static final String DEFAULT_COUNTRY_ISO = "US"; - @VisibleForTesting public static CountryDetector sInstance; + @VisibleForTesting public static CountryDetector instance; private final TelephonyManager telephonyManager; private final LocaleProvider localeProvider; @@ -121,9 +121,9 @@ public class CountryDetector { /** @return the single instance of the {@link CountryDetector} */ public static synchronized CountryDetector getInstance(Context context) { - if (sInstance == null) { + if (instance == null) { Context appContext = context.getApplicationContext(); - sInstance = + instance = new CountryDetector( appContext, (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE), @@ -131,7 +131,7 @@ public class CountryDetector { Locale::getDefault, new Geocoder(appContext)); } - return sInstance; + return instance; } public String getCurrentCountryIso() { -- cgit v1.2.3