Merge "Update Dialer to v10 RC32" into oc-dev

1 files changed, 8 insertions, 0 deletions

diff --git a/java/com/android/dialer/common/ConfigProviderBindings.java b/java/com/android/dialer/common/ConfigProviderBindings.java
index 92e6cc3ff..9f045add4 100644
--- a/java/com/android/dialer/common/ConfigProviderBindings.java
+++ b/java/com/android/dialer/common/ConfigProviderBindings.java
@@ -20,17 +20,25 @@ import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
+import android.support.v4.os.UserManagerCompat;
 
 /** Accessor for getting a {@link ConfigProvider}. */
 public class ConfigProviderBindings {
 
   private static ConfigProvider configProvider;
+  private static ConfigProvider configProviderStub;
 
   public static ConfigProvider get(@NonNull Context context) {
     Assert.isNotNull(context);
     if (configProvider != null) {
       return configProvider;
     }
+    if (!UserManagerCompat.isUserUnlocked(context)) {
+      if (configProviderStub == null) {
+        configProviderStub = new ConfigProviderStub();
+      }
+      return configProviderStub;
+    }
 
     Context application = context.getApplicationContext();
     if (application instanceof ConfigProviderFactory) {