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: I662b0b1b6f316564a3f9a318e558d02f3c8a96d0
This commit is contained in:
Sudheer Shanka
2016-06-01 18:39:52 +00:00
committed by android-build-merger

View File

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