diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index eae23a49f5c..2a7e08f6834 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -615,9 +615,9 @@ public class UserSettings extends SettingsPreferenceFragment } } - private boolean emergencyInfoActivityPresent() { + private static boolean emergencyInfoActivityPresent(Context context) { Intent intent = new Intent(ACTION_EDIT_EMERGENCY_INFO).setPackage("com.android.emergency"); - List infos = getContext().getPackageManager().queryIntentActivities(intent, 0); + List infos = context.getPackageManager().queryIntentActivities(intent, 0); if (infos == null || infos.isEmpty()) { return false; } @@ -865,7 +865,7 @@ public class UserSettings extends SettingsPreferenceFragment mUserCaps.mDisallowAddUser ? mUserCaps.mEnforcedAdmin : null); } - if (emergencyInfoActivityPresent()) { + if (emergencyInfoActivityPresent(getContext())) { mEmergencyInfoPreference.setOnPreferenceClickListener(this); mEmergencyInfoPreference.setOrder(Preference.DEFAULT_ORDER); preferenceScreen.addPreference(mEmergencyInfoPreference); @@ -1149,6 +1149,12 @@ public class UserSettings extends SettingsPreferenceFragment data.screenTitle = res.getString(R.string.user_settings_title); result.add(data); } + if (emergencyInfoActivityPresent(context)) { + data = new SearchIndexableRaw(context); + data.title = res.getString(R.string.emergency_info_title); + data.screenTitle = res.getString(R.string.emergency_info_title); + result.add(data); + } return result; } };