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

This commit is contained in:
TreeHugger Robot
2016-06-01 18:16:21 +00:00
committed by Android (Google) Code Review

View File

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