commit 0ca1c80f1ca60966a16169b109e96ac19fa69743
author Etan Cohen <etancohen@google.com> Mon Jul 07 15:35:48 2014 -0700
committer Etan Cohen <etancohen@google.com> Tue Jul 08 07:47:18 2014 -0700
tree 318587d9f2bf78190cc23aa71f38ffe126f73147
parent 48b1b84ed64d08adba0195fd8986fcb90c934ac6

Merge IMS changes from klp-wireless-dev to master

Change-Id: I247fa2b0e3aa159a27d96951edb0b04afd4d5ec6

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index cec266d..289767d 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -1624,7 +1624,10 @@
                     addPreferencesFromResource(R.xml.cdma_call_privacy);
                 }
             } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
-                addPreferencesFromResource(R.xml.gsm_umts_call_options);
+                if (getResources().getBoolean(
+                            R.bool.config_additional_call_setting)) {
+                    addPreferencesFromResource(R.xml.gsm_umts_call_options);
+                }
             } else {
                 throw new IllegalStateException("Unexpected phone type: " + phoneType);
             }