commit 77644dd6b88941a0c49be8dffea6de7403516f6a
author Jordan Liu <jminjie@google.com> Mon Oct 23 20:27:28 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 23 20:27:28 2017 +0000
tree 6910a0faebe47b888b526222fb2f7d055c606406
parent eb0fb7907b6578f5dcad9d423ac8df6c7c38085e
parent 8af41c945a07da577b1bed3f969cff374655f02f

Merge "Show voicemail number as the default number for call forwarding"

src/com/android/phone/CallForwardEditPreference.java

diff --git a/src/com/android/phone/CallForwardEditPreference.java b/src/com/android/phone/CallForwardEditPreference.java
index 9e153b2..5243b8d 100644
--- a/src/com/android/phone/CallForwardEditPreference.java
+++ b/src/com/android/phone/CallForwardEditPreference.java
@@ -150,7 +150,18 @@
         if (DBG) Log.d(LOG_TAG, "handleGetCFResponse done, callForwardInfo=" + callForwardInfo);
 
         setToggled(callForwardInfo.status == 1);
-        setPhoneNumber(callForwardInfo.number);
+        boolean displayVoicemailNumber = false;
+        if (TextUtils.isEmpty(callForwardInfo.number)) {
+            PersistableBundle carrierConfig =
+                    PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
+            if (carrierConfig != null) {
+                displayVoicemailNumber = carrierConfig.getBoolean(CarrierConfigManager
+                        .KEY_DISPLAY_VOICEMAIL_NUMBER_AS_DEFAULT_CALL_FORWARDING_NUMBER_BOOL);
+                Log.d(LOG_TAG, "display voicemail number as default");
+            }
+        }
+        String voicemailNumber = mPhone.getVoiceMailNumber();
+        setPhoneNumber(displayVoicemailNumber ? voicemailNumber : callForwardInfo.number);
     }
 
     private void updateSummaryText() {