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

am: 4080861e75

* commit '4080861e75bb001413cab1f8a4ce46cb5a3f259e':
  Start DeviceAdminSettings in a new task from support dialog.

Change-Id: I95148191a78092ef2c69db331eba06c8d7409be8

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);