commit fb9d621823d8f68d3e8e7b543be23506ba6a2e7e
author Jordan Liu <jminjie@google.com> Mon Oct 23 21:05:09 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 23 21:05:09 2017 +0000
tree 5fc7a8cc9ba668134f94ac2a9ae637f888070550
parent ee8a945ad7fbcaf4e008ff73ef389ed296fa60f4
parent fe7010c2a50398a8f81b08453fb9e2c3fa45e012

Merge "Show voicemail number as the default number for call forwarding" am: 77644dd6b8 am: 99c25432e9
am: fe7010c2a5

Change-Id: I292dd85b1a758c728ee522c26ed3348897938306

src/com/android/phone/CallForwardEditPreference.java

diff --git a/src/com/android/phone/CallForwardEditPreference.java b/src/com/android/phone/CallForwardEditPreference.java
index 32e91d0..8a82e05 100644
--- a/src/com/android/phone/CallForwardEditPreference.java
+++ b/src/com/android/phone/CallForwardEditPreference.java
@@ -162,7 +162,18 @@
         }
 
         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() {