summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortwyen <twyen@google.com>2017-11-20 22:12:13 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-11-20 22:12:13 +0000
commit1f67ee561455aa733e36ba3c824367f70089ec6a (patch)
treec2927e4259bac80faffdf4ebea06445ff88a14da
parent4189b56a1d79e40a9bb1edb817826efda55f1448 (diff)
parent599205c0bfc0107f0d4043aa9582e21e3576dfa4 (diff)
Merge "Add config flag for CallingAccountSelector"
am: 599205c0bf Change-Id: Iad508dada68dc18fd6e2c62585bcc20f8a9390c1
-rw-r--r--java/com/android/dialer/precall/impl/CallingAccountSelector.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/java/com/android/dialer/precall/impl/CallingAccountSelector.java b/java/com/android/dialer/precall/impl/CallingAccountSelector.java
index e0fe0c488..d46e31711 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.Assert;
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 @@ public class CallingAccountSelector implements PreCallAction {
@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;
}