Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
df66d4abf0
@@ -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);
|
||||||
|
Reference in New Issue
Block a user