release-request-52da03e1-319b-479f-b7b2-2df79bc638cf-for-git_oc-dr1-release-4207440 snap-temp-L67200000085022454

Change-Id: Ie6130b4ebd3601740c58672fdf39407eceda0c88

2 files changed, 8 insertions, 0 deletions

diff --git a/src/com/android/emergency/edit/EditInfoFragment.java b/src/com/android/emergency/edit/EditInfoFragment.java
index eb642e2..006c725 100644
--- a/src/com/android/emergency/edit/EditInfoFragment.java
+++ b/src/com/android/emergency/edit/EditInfoFragment.java
@@ -58,6 +58,10 @@ public class EditInfoFragment extends PreferenceFragment {
         for (String preferenceKey : PreferenceKeys.KEYS_EDIT_EMERGENCY_INFO) {
             Preference preference = findPreference(preferenceKey);
             mMedicalInfoPreferences.put(preferenceKey, preference);
+
+            if (((ReloadablePreferenceInterface) preference).isNotSet()) {
+                getMedicalInfoParent().removePreference(preference);
+            }
         }
 
         // Fill in emergency contacts.
diff --git a/src/com/android/emergency/view/ViewEmergencyInfoFragment.java b/src/com/android/emergency/view/ViewEmergencyInfoFragment.java
index d3eef03..baa7996 100644
--- a/src/com/android/emergency/view/ViewEmergencyInfoFragment.java
+++ b/src/com/android/emergency/view/ViewEmergencyInfoFragment.java
@@ -45,6 +45,10 @@ public class ViewEmergencyInfoFragment extends PreferenceFragment {
         for (String preferenceKey : PreferenceKeys.KEYS_VIEW_EMERGENCY_INFO) {
             Preference preference = findPreference(preferenceKey);
             mPreferences.add(preference);
+
+            if (((ReloadablePreferenceInterface) preference).isNotSet()) {
+                getPreferenceScreen().removePreference(preference);
+            }
         }
     }