commit 184753f64fce1cd7a2c17534be393293f1b78f4a
author Meng Wang <mewan@google.com> Wed Jun 15 18:17:06 2016 -0700
committer Meng Wang <mewan@google.com> Thu Jun 16 17:32:20 2016 -0700
tree e1b0320f83b944c413846c3afd5ca8a995b7e8ad
parent 223d45ea0ed96e10911cfbf4f5b3ca770be30fbe

Hide 'Update Emergecy Address' preference w/o carrier support

Bug: 29256401
Change-Id: I59f9d6192d39e2a259e3f2cbee641335d5b8b8d7

src/com/android/settings/WifiCallingSettings.java

diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index b93b246..352e317 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -349,9 +349,12 @@
         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);