Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev am: df66d4abf0 am: 4080861e75

am: 1da829632c

* commit '1da829632c67409a3cf43bd34ba9cd3765bd58a6':
  Start DeviceAdminSettings in a new task from support dialog.

Change-Id: I70af91afd7cbb376ef30387d5dc3486d8544afa2

src/com/android/settings/ShowAdminSupportDetailsDialog.java

@@ -161,6 +161,7 @@ public class ShowAdminSupportDetailsDialog extends Activity
                                     new UserHandle(enforcedAdmin.userId));
                         } else {
                             intent.setClass(activity, Settings.DeviceAdminSettingsActivity.class);
+                            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                             // Activity merges both managed profile and parent users
                             // admins so show as same user as this activity.
                             activity.startActivity(intent);