commit df66d4abf0c994b5f53ec0978ba97e746852e3e9
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 01 18:16:21 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 01 18:16:21 2016 +0000
tree 359b01326a0fa787da3fca48196fabb2f30e3bb3
parent ed703565063107350970959d82ac63eb76b51d26
parent 65cabcd4eee44ea641a81b5e86ec4b9a3d2dd918

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

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