From 5ea4bb2f43d2097604ffef5cca7ba0e23f5acd90 Mon Sep 17 00:00:00 2001
From: Meng Wang <mewan@google.com>
Date: Thu, 18 Aug 2016 12:19:01 -0700
Subject: [PATCH] DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode
 preference if not editable

Bug: 30947921
Change-Id: I80240fbd912afa9a40cee38070c4e77d5e9d6ae9
(cherry picked from commit 4436d6fe16c3a685b839358006183d1e8d304a33)
---
 src/com/android/settings/WifiCallingSettings.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index 7484b84804c..0af6ffa64f0 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -363,7 +363,12 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
         final PreferenceScreen preferenceScreen = getPreferenceScreen();
         boolean updateAddressEnabled = (getCarrierActivityIntent(context) != null);
         if (wfcEnabled) {
-            preferenceScreen.addPreference(mButtonWfcMode);
+            if (mEditableWfcMode) {
+                preferenceScreen.addPreference(mButtonWfcMode);
+            } else {
+                // Don't show WFC mode preference if it's not editable.
+                preferenceScreen.removePreference(mButtonWfcMode);
+            }
             if (updateAddressEnabled) {
                 preferenceScreen.addPreference(mUpdateAddress);
             } else {