diff --git a/res/values/strings.xml b/res/values/strings.xml
index cb84f3d12a4..af9da698326 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5297,10 +5297,6 @@
Turn on phone calls & SMS?
Call and SMS history will be shared with this user.
-
- Emergency information
-
- Accessible through lock screen in the emergency dialer
Allow apps and content
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index ac2685fb870..4fefc105552 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -35,9 +35,5 @@
android:key="add_users_when_locked"
android:title="@string/user_add_on_lockscreen_menu"
android:summary="@string/user_add_on_lockscreen_menu_summary" />
-
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 8229464c271..06ec96660e7 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -101,7 +101,6 @@ public class UserSettings extends SettingsPreferenceFragment
private static final String KEY_USER_LIST = "user_list";
private static final String KEY_USER_ME = "user_me";
private static final String KEY_ADD_USER = "user_add";
- private static final String KEY_EMERGENCY_INFO = "emergency_info";
private static final int MENU_REMOVE_USER = Menu.FIRST;
@@ -135,7 +134,6 @@ public class UserSettings extends SettingsPreferenceFragment
private DimmableIconPreference mAddUser;
private PreferenceGroup mLockScreenSettings;
private RestrictedSwitchPreference mAddUserWhenLocked;
- private Preference mEmergencyInfoPreference;
private int mRemovingUserId = -1;
private int mAddedUserId = 0;
private boolean mAddingUser;
@@ -231,8 +229,6 @@ public class UserSettings extends SettingsPreferenceFragment
}
mLockScreenSettings = (PreferenceGroup) findPreference("lock_screen_settings");
mAddUserWhenLocked = (RestrictedSwitchPreference) findPreference("add_users_when_locked");
- mEmergencyInfoPreference = findPreference(KEY_EMERGENCY_INFO);
- mEmergencyInfoPreference.setOnPreferenceClickListener(this);
loadProfile();
setHasOptionsMenu(true);
IntentFilter filter = new IntentFilter(Intent.ACTION_USER_REMOVED);
@@ -921,9 +917,6 @@ public class UserSettings extends SettingsPreferenceFragment
} else {
onAddUserClicked(USER_TYPE_USER);
}
- } else if (pref == mEmergencyInfoPreference) {
- Intent intent = new Intent("com.android.emergency.EDIT_EMERGENGY_INFO");
- startActivity(intent);
}
return false;
}