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

Merge "Fix getDefaultDisplayHomeActivityForUser."

Browse Source
This commit is contained in:
Martijn Coenen
2018-11-09 08:04:37 +00:00
committed by Android (Google) Code Review
parent 230de7db7f 2a5c839dad
commit bc4afc4f60
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/ActivityStackSupervisor.java
View File

@@ -2626,8 +2626,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
}
ActivityRecord getDefaultDisplayHomeActivityForUser(int userId) {
getActivityDisplay(DEFAULT_DISPLAY).getHomeActivityForUser(userId);
return null;
return getActivityDisplay(DEFAULT_DISPLAY).getHomeActivityForUser(userId);
}
void resizeStackLocked(ActivityStack stack, Rect bounds, Rect tempTaskBounds,

7
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -6267,8 +6267,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
FLAG_ACTIVITY_TASK_ON_HOME);
ActivityOptions activityOptions = options != null
? new ActivityOptions(options) : ActivityOptions.makeBasic();
activityOptions.setLaunchTaskId(
mStackSupervisor.getDefaultDisplayHomeActivity().getTask().taskId);
final ActivityRecord homeActivity =
mStackSupervisor.getDefaultDisplayHomeActivity();
if (homeActivity != null) {
activityOptions.setLaunchTaskId(homeActivity.getTask().taskId);
}
mContext.startActivityAsUser(intent, activityOptions.toBundle(),
UserHandle.CURRENT);
} finally {