commit 2a93aa71f3755a3db6bf3bccc1bd8d6f4e260fdc
author Hall Liu <hallliu@google.com> Fri Sep 21 00:10:36 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 21 00:10:36 2018 +0000
tree 8886774978d688c2cf4b8259d2e54822fee4bfdb
parent 58ac86be18e92e95c594fb687b2a9c17b2b8c6da
parent e20c323ab9561909573edb7acd3d787db639be96

Merge "Remove no-reply timer of CFNRy for certain carriers"

src/com/android/phone/CallForwardEditPreference.java

diff --git a/src/com/android/phone/CallForwardEditPreference.java b/src/com/android/phone/CallForwardEditPreference.java
index bfeee7a..f926de2 100644
--- a/src/com/android/phone/CallForwardEditPreference.java
+++ b/src/com/android/phone/CallForwardEditPreference.java
@@ -100,7 +100,15 @@
             int action = (isToggled() || (mButtonClicked == DialogInterface.BUTTON_POSITIVE)) ?
                     CommandsInterface.CF_ACTION_REGISTRATION :
                     CommandsInterface.CF_ACTION_DISABLE;
-            int time = (reason != CommandsInterface.CF_REASON_NO_REPLY) ? 0 : 20;
+            int time = 0;
+            if (reason == CommandsInterface.CF_REASON_NO_REPLY) {
+                PersistableBundle carrierConfig = PhoneGlobals.getInstance()
+                        .getCarrierConfigForSubId(mPhone.getSubId());
+                if (carrierConfig.getBoolean(
+                        CarrierConfigManager.KEY_SUPPORT_NO_REPLY_TIMER_FOR_CFNRY_BOOL, true)) {
+                    time = 20;
+                }
+            }
             final String number = getPhoneNumber();
 
             Log.d(LOG_TAG, "callForwardInfo=" + callForwardInfo);