1 files changed, 5 insertions, 1 deletions
diff --git a/java/com/android/dialer/location/CountryDetector.java b/java/com/android/dialer/location/CountryDetector.java
index fd93b6ae9..a90febf2b 100644
--- a/java/com/android/dialer/location/CountryDetector.java
+++ b/java/com/android/dialer/location/CountryDetector.java
@@ -28,6 +28,7 @@ import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
+import android.support.v4.os.UserManagerCompat;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import com.android.dialer.common.Assert;
@@ -159,8 +160,11 @@ public class CountryDetector {
   }
 
   /** @return the geocoded country code detected by the {@link LocationManager}. */
+  @Nullable
   private String getLocationBasedCountryIso() {
-    if (!Geocoder.isPresent() || !PermissionsUtil.hasLocationPermissions(appContext)) {
+    if (!Geocoder.isPresent()
+        || !PermissionsUtil.hasLocationPermissions(appContext)
+        || !UserManagerCompat.isUserUnlocked(appContext)) {
       return null;
     }
     return PreferenceManager.getDefaultSharedPreferences(appContext)