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

Commit f781a621 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clear lifecycle description on recycle and improve logging."

parents 08aba3cc f52974c8

core/java/android/app/servertransaction/ActivityLifecycleItem.java

+5 −0
Original line number Diff line number Diff line
@@ -91,4 +91,9 @@ public abstract class ActivityLifecycleItem extends ClientTransactionItem { 
        pw.println(prefix + "target state:" + getTargetState());

        pw.println(prefix + "description: " + mDescription);

    }



    @Override

    public void recycle() {

        setDescription(null);

    }

}

core/java/android/app/servertransaction/DestroyActivityItem.java

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ public class DestroyActivityItem extends ActivityLifecycleItem { 


    @Override

    public void recycle() {

        super.recycle();

        mFinished = false;

        mConfigChanges = 0;

        ObjectPool.recycle(this);

core/java/android/app/servertransaction/PauseActivityItem.java

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ public class PauseActivityItem extends ActivityLifecycleItem { 


    @Override

    public void recycle() {

        super.recycle();

        mFinished = false;

        mUserLeaving = false;

        mConfigChanges = 0;

core/java/android/app/servertransaction/ResumeActivityItem.java

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ public class ResumeActivityItem extends ActivityLifecycleItem { 


    @Override

    public void recycle() {

        super.recycle();

        mProcState = ActivityManager.PROCESS_STATE_UNKNOWN;

        mUpdateProcState = false;

        mIsForward = false;

core/java/android/app/servertransaction/StopActivityItem.java

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ public class StopActivityItem extends ActivityLifecycleItem { 


    @Override

    public void recycle() {

        super.recycle();

        mShowWindow = false;

        mConfigChanges = 0;

        ObjectPool.recycle(this);