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

am: 6d6ea3f

* commit '6d6ea3fe0a9aae6159b3eda197cd1d660135c413':
  Use same task for Settings>Users and EmergencyInfo

Change-Id: Ifc596101c4392bb76f2d6038c364560ebc42fefa
This commit is contained in:
mariagpuyol
2016-03-31 17:44:34 +00:00
committed by android-build-merger

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;