commit fe7010c2a50398a8f81b08453fb9e2c3fa45e012
author Jordan Liu <jminjie@google.com> Mon Oct 23 20:48:33 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 23 20:48:33 2017 +0000
tree b46ddef99aba0be32f6fe0173c8e341f4aa1ff58
parent 2e51ab6877cf6979694572bce711f1f1a520502f
parent 99c25432e9b53f006ca9f1d1208ceafb080f90fb

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

Change-Id: I5f1b107cf9df960c0411f26facc5647f61d5832b

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() {