From 6ca8940880219305a84542db3d1a212c53f23edc Mon Sep 17 00:00:00 2001
From: mariagpuyol <mariagpuyol@google.com>
Date: Wed, 30 Mar 2016 18:04:54 -0700
Subject: [PATCH] Use same task for Settings>Users and EmergencyInfo

Bug:27859534
Change-Id: I0ea4e56e4f6daacfd478336444aceeb84d8bfe5d
---
 src/com/android/settings/users/UserSettings.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index af95056c606..e47a36e0c94 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -953,7 +953,7 @@ public class UserSettings extends SettingsPreferenceFragment
             }
         } else if (pref == mEmergencyInfoPreference) {
             Intent intent = new Intent(ACTION_EDIT_EMERGENCY_INFO);
-            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
             startActivity(intent);
         }
         return false;