commit 99c25432e9b53f006ca9f1d1208ceafb080f90fb
author Jordan Liu <jminjie@google.com> Mon Oct 23 20:39:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 23 20:39:30 2017 +0000
tree db3e6de50d7e5951793f049f93a0df36c9e8e706
parent a9aa7abf5aa2ad5202d89aa4e082a7318fe3b3c0
parent 77644dd6b88941a0c49be8dffea6de7403516f6a

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

Change-Id: I84225e143b435dccde1613e3e4c93e0fd37e6180

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