commit 2a817d97fe0c419dcb6d125f8338a4cc4db13034
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Jun 18 04:02:49 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 18 04:02:49 2016 +0000
tree 4207945212beabbf0af4f3203f7764c2963d856a
parent b2728f51fbae09e1272ea7f4bb544272fb1e8b22
parent 184753f64fce1cd7a2c17534be393293f1b78f4a

Merge "Hide 'Update Emergecy Address' preference w/o carrier support" into nyc-mr1-dev

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);