commit 599205c0bfc0107f0d4043aa9582e21e3576dfa4
author Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 20 22:02:10 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 20 22:02:10 2017 +0000
tree c2927e4259bac80faffdf4ebea06445ff88a14da
parent 299bc13332e3153fe57bdf83f59d5f82109911cc
parent 3c8ab7ed43cbda8b0c9620b9edad48e49e61f1be

Merge "Add config flag for CallingAccountSelector"

java/com/android/dialer/precall/impl/CallingAccountSelector.java

diff --git a/java/com/android/dialer/precall/impl/CallingAccountSelector.java b/java/com/android/dialer/precall/impl/CallingAccountSelector.java
index e0fe0c4..d46e317 100644
--- a/java/com/android/dialer/precall/impl/CallingAccountSelector.java
+++ b/java/com/android/dialer/precall/impl/CallingAccountSelector.java
@@ -39,6 +39,7 @@
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.precall.PreCallAction;
 import com.android.dialer.precall.PreCallCoordinator;
 import com.android.dialer.precall.PreCallCoordinator.PendingAction;
@@ -62,6 +63,11 @@
 
   @Override
   public boolean requiresUi(Context context, CallIntentBuilder builder) {
+    if (!ConfigProviderBindings.get(context)
+        .getBoolean("precall_calling_account_selector_enabled", true)) {
+      return false;
+    }
+
     if (builder.getPhoneAccountHandle() != null) {
       return false;
     }