diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 3d16141bc5a7c..e3f4999adf0d9 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -41,7 +41,6 @@ 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; @@ -4713,7 +4712,6 @@ 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 15b7b64a2cacb..58c14f17c1c3d 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -1280,10 +1280,6 @@ 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 c6444bfaf26c8..be36f01d39f1f 100644 --- a/services/core/java/com/android/server/am/TaskRecord.java +++ b/services/core/java/com/android/server/am/TaskRecord.java @@ -245,8 +245,6 @@ 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) {