Merge "Use same task for Settings>Users and EmergencyInfo" into nyc-dev

This commit is contained in:
Maria Garcia Puyol
2016-03-31 17:38:55 +00:00
committed by Android (Google) Code Review

View File

@@ -953,7 +953,7 @@ public class UserSettings extends SettingsPreferenceFragment
} }
} else if (pref == mEmergencyInfoPreference) { } else if (pref == mEmergencyInfoPreference) {
Intent intent = new Intent(ACTION_EDIT_EMERGENCY_INFO); 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); startActivity(intent);
} }
return false; return false;