From 6056eba0e7a736efd7c9ea0cc9d370a7d975aa78 Mon Sep 17 00:00:00 2001
From: mariagpuyol <mariagpuyol@google.com>
Date: Thu, 23 Jun 2016 08:06:52 -0700
Subject: [PATCH] Make Emergency info searchable in Settings

Bug:27925442
Change-Id: I1318592b09f7cf1daf538edd02321cb6557b289e
---
 src/com/android/settings/users/UserSettings.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index d6b189b08fe..0975cba141f 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<ResolveInfo> infos = getContext().getPackageManager().queryIntentActivities(intent, 0);
+        List<ResolveInfo> infos = context.getPackageManager().queryIntentActivities(intent, 0);
         if (infos == null || infos.isEmpty()) {
             return false;
         }
@@ -863,7 +863,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);
@@ -1147,6 +1147,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;
                 }
             };