commit 2f810e8d1b9cb3b3f0b4020596e307671e33ac4b
author Xiangyu/Malcolm Chen <refuhoo@google.com> Thu Mar 29 18:56:16 2018 +0000
committer Xiangyu/Malcolm Chen <refuhoo@google.com> Thu Mar 29 18:57:50 2018 +0000
tree e112dc906fa9af7757758cd43ac2cf706c6a92ef
parent b50e1482a2f0cb3d3052584c038b8798466460af

Re-submit "Fix not display the FDN menu if a SIM doesn't support FDN"

This reverts commit b50e1482a2f0cb3d3052584c038b8798466460af.

Reason for revert: re-submit I35ca072e2e420038c143bcd6941544b1c5276644

Change-Id: Ifc9a94052b799907826853823e9cb15f2ed4e69e

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 8da980c..fd85585 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -281,7 +281,9 @@
                         addPreferencesFromResource(R.xml.cdma_call_privacy);
                     }
                 } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
-
+                    if (mPhone.getIccCard() == null || !mPhone.getIccCard().getIccFdnAvailable()) {
+                        prefSet.removePreference(fdnButton);
+                    }
                     if (carrierConfig.getBoolean(
                             CarrierConfigManager.KEY_ADDITIONAL_CALL_SETTING_BOOL)) {
                         addPreferencesFromResource(R.xml.gsm_umts_call_options);