From 184753f64fce1cd7a2c17534be393293f1b78f4a Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Wed, 15 Jun 2016 18:17:06 -0700 Subject: [PATCH] Hide 'Update Emergecy Address' preference w/o carrier support Bug: 29256401 Change-Id: I59f9d6192d39e2a259e3f2cbee641335d5b8b8d7 --- src/com/android/settings/WifiCallingSettings.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java index b93b24627fa..352e3177196 100644 --- a/src/com/android/settings/WifiCallingSettings.java +++ b/src/com/android/settings/WifiCallingSettings.java @@ -349,9 +349,12 @@ public class WifiCallingSettings extends SettingsPreferenceFragment mButtonWfcMode.setEnabled(wfcEnabled); final PreferenceScreen preferenceScreen = getPreferenceScreen(); + boolean updateAddressEnabled = (getCarrierActivityIntent(context) != null); if (wfcEnabled) { preferenceScreen.addPreference(mButtonWfcMode); - preferenceScreen.addPreference(mUpdateAddress); + if (updateAddressEnabled) { + preferenceScreen.addPreference(mUpdateAddress); + } } else { preferenceScreen.removePreference(mButtonWfcMode); preferenceScreen.removePreference(mUpdateAddress);