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

Fix getDefaultDisplayHomeActivityForUser.

Browse Source 
And check for null HomeActivity record, To fix NullPointerException
in ActivityManagerService.

Bug: 116875894
Test: builds
Change-Id: I543c235011bf668e0b1bfbc4252a41c49490ac27
This commit is contained in:
Martijn Coenen
2018-10-01 10:17:06 +02:00
parent 5061977080
commit 2a5c839dad
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

@@ -2611,8 +2611,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

@@ -6296,8 +6296,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 {