diff options
3 files changed, 8 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index e3f4999adf0d..3d16141bc5a7 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -41,6 +41,7 @@ import android.graphics.Point; import android.graphics.Rect; import android.util.ArraySet; +import android.util.Log; import com.android.internal.app.IVoiceInteractor; import com.android.internal.content.ReferrerIntent; import com.android.internal.os.BatteryStatsImpl; @@ -4712,6 +4713,7 @@ final class ActivityStack { } task.stack = null; + task.lastStackClear = Log.getStackTraceString(new Throwable()); } TaskRecord createTaskRecord(int taskId, ActivityInfo info, Intent intent, diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index ab0263cec459..7135c70b644d 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -1281,6 +1281,10 @@ class ActivityStarter { } private ActivityRecord setTargetStackAndMoveToFrontIfNeeded(ActivityRecord intentActivity) { + if (intentActivity.task.stack == null) { + Slog.wtf(TAG, "Oops, the stack is null, we are about to crash. It was last cleared: " + + intentActivity.task.lastStackClear); + } mTargetStack = intentActivity.task.stack; mTargetStack.mLastPausedActivity = null; // If the target task is not in the front, then we need to bring it to the front... diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java index be36f01d39f1..c6444bfaf26c 100644 --- a/services/core/java/com/android/server/am/TaskRecord.java +++ b/services/core/java/com/android/server/am/TaskRecord.java @@ -245,6 +245,8 @@ final class TaskRecord { int mLayerRank = -1; Configuration mOverrideConfig = Configuration.EMPTY; + // STOPSHIP(b/26541093) + public String lastStackClear = "UNSET"; TaskRecord(ActivityManagerService service, int _taskId, ActivityInfo info, Intent _intent, IVoiceInteractionSession _voiceSession, IVoiceInteractor _voiceInteractor) { |