From 5ded99777adb734a62f7c367b29f589e72955e48 Mon Sep 17 00:00:00 2001
From: Filip Gruszczynski <gruszczy@google.com>
Date: Wed, 20 Jan 2016 17:52:04 +0000
Subject: Revert "Temporary logging to debug ActivityStarter crash."

Bug: 26541093

This reverts commit 7fca6d50a57cbc1a45beca1d5d1e5cd1e696fbef.

Change-Id: I41fb70e79f2da6523c40f09a74d1980cbeb2149e
---
 services/core/java/com/android/server/am/ActivityStack.java   | 2 --
 services/core/java/com/android/server/am/ActivityStarter.java | 4 ----
 services/core/java/com/android/server/am/TaskRecord.java      | 2 --
 3 files changed, 8 deletions(-)

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 3d16141bc5a7..e3f4999adf0d 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 15b7b64a2cac..58c14f17c1c3 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 c6444bfaf26c..be36f01d39f1 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) {
-- 
cgit v1.2.3-59-g8ed1b