Merge \"WifiCallingSettings: UI improvement\" into nyc-mr1-dev

am: d70ebc7bc4 Change-Id: I717bf769eb87112f46c0a4d01c212794212036af
2016-06-23 00:07:10 +00:00
parent 4938a9a470 d70ebc7bc4
commit 50a4f6b690
1 changed files with 2 additions and 0 deletions
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -354,6 +354,8 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
            preferenceScreen.addPreference(mButtonWfcMode);
            if (updateAddressEnabled) {
                preferenceScreen.addPreference(mUpdateAddress);
+            } else {
+                preferenceScreen.removePreference(mUpdateAddress);
            }
        } else {
            preferenceScreen.removePreference(mButtonWfcMode);