Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3d9ddfa authored by Filip Gruszczynski's avatar Filip Gruszczynski Committed by Android (Google) Code Review
Browse files

Merge "Temporary logging to debug ActivityStarter crash."

parents 6cf93664 7fca6d50

services/core/java/com/android/server/am/ActivityStack.java

+2 −0
Original line number Diff line number Diff line
@@ -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,

services/core/java/com/android/server/am/ActivityStarter.java

+4 −0
Original line number Diff line number Diff line
@@ -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...

services/core/java/com/android/server/am/TaskRecord.java

+2 −0
Original line number Diff line number Diff line
@@ -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) {