commit e20c323ab9561909573edb7acd3d787db639be96
author Chanwei Chi <Changwei.X.Chi@sony.com> Wed Jan 17 12:45:18 2018 +0900
committer Takeshi Tanigawa <takeshi.tanigawa@sony.com> Thu Sep 20 20:59:37 2018 +0900
tree 259331a0b36721cf7e2d8cc32505487ed8a08336
parent 56800bca38053740d57f5a9554f3daba9b1d86f3

Remove no-reply timer of CFNRy for certain carriers

Some carriers do not support no-reply timer of CFNRy.
So, if it is configured by carrier config, request CFNRy without
no-reply timer when a user sets CFNRy in settings UI

Test: manual - Check that CFNRy is requested without no-reply timer
if it configured.
Bug: 110121791

Change-Id: I8187d5cbe3202be57e84eec862210ddeef8781d8

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);