commit 4080861e75bb001413cab1f8a4ce46cb5a3f259e
author Sudheer Shanka <sudheersai@google.com> Wed Jun 01 18:39:24 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 01 18:39:24 2016 +0000
tree 2da858ad5f7a7eb93df48c0a5773c8cceb75b5d8
parent 7e1b47347a9f44d1b6748ea28ac8fe3912a4d27a
parent df66d4abf0c994b5f53ec0978ba97e746852e3e9

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

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

Change-Id: I6a249b3e238f0ab8336e1a6d81bf77d7b2d3a11d

src/com/android/settings/ShowAdminSupportDetailsDialog.java

diff --git a/src/com/android/settings/ShowAdminSupportDetailsDialog.java b/src/com/android/settings/ShowAdminSupportDetailsDialog.java
index fce669c..3b679eb 100644
--- a/src/com/android/settings/ShowAdminSupportDetailsDialog.java
+++ b/src/com/android/settings/ShowAdminSupportDetailsDialog.java
@@ -161,6 +161,7 @@
                                     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);