commit 2a5c839dad8fce78cdd6ea93d37f1607f29a33da
author Martijn Coenen <maco@google.com> Mon Oct 01 10:17:06 2018 +0200
committer Martijn Coenen <maco@google.com> Wed Nov 07 21:09:39 2018 +0100
tree 9c35d8f8ea90c89f5d2a389ebe304552ae68d51e
parent 50619770805796dbec93eb9378c8dc21f6f66f7d

Fix getDefaultDisplayHomeActivityForUser.

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

Bug: 116875894
Test: builds
Change-Id: I543c235011bf668e0b1bfbc4252a41c49490ac27

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 3ede8bc8..195f048 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -6296,8 +6296,11 @@
                             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 {