Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Fix that work apps settings page crash after changing work profile to use separated lock\" into nyc-dev

Browse Source 
am: 6437205648

Change-Id: Id19fe2488406a3891cd433d8b1e9273a28b48fbb
This commit is contained in:
Victor Chang
2016-06-16 15:21:12 +00:00
committed by android-build-merger
parent 69147f24ae 6437205648
commit 9feb501659
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/am/ActivityStartInterceptor.java
View File

@@ -186,9 +186,13 @@ class ActivityStartInterceptor {
if (mActivityOptions == null) { if (mActivityOptions == null) {
mActivityOptions = ActivityOptions.makeBasic(); mActivityOptions = ActivityOptions.makeBasic();
} }
// Showing credential confirmation activity in home task to avoid stopping multi-windowed
// mode after showing the full-screen credential confirmation activity. ActivityRecord homeActivityRecord = mSupervisor.getHomeActivity();
mActivityOptions.setLaunchTaskId(mSupervisor.getHomeActivity().task.taskId); if (homeActivityRecord != null && homeActivityRecord.task != null) {
// Showing credential confirmation activity in home task to avoid stopping multi-windowed
// mode after showing the full-screen credential confirmation activity.
mActivityOptions.setLaunchTaskId(homeActivityRecord.task.taskId);
}
final UserInfo parent = mUserManager.getProfileParent(mUserId); final UserInfo parent = mUserManager.getProfileParent(mUserId);
mRInfo = mSupervisor.resolveIntent(mIntent, mResolvedType, parent.id); mRInfo = mSupervisor.resolveIntent(mIntent, mResolvedType, parent.id);