Merge "Revert "Temporary logging to debug ActivityStarter crash.""
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 3d16141..e3f4999a 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.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 @@
}
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 cfef431..02f81c0 100644
--- a/services/core/java/com/android/server/am/ActivityStarter.java
+++ b/services/core/java/com/android/server/am/ActivityStarter.java
@@ -1281,10 +1281,6 @@
}
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 71cfeab..cc86a62 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 @@
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) {