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

Commit f52974c8 authored Feb 14, 2018 by Bryce Lee

Clear lifecycle description on recycle and improve logging.

This changelist clear any custom description set on a lifecycle item
and improves the data logged. This changelist should be reverted once
the root cause has been discovered.

Bug: 71506345
Test: manual
Change-Id: I38edb292684745e6e912b3ba09fb220bf7f39149

parent 427ef56c

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

+5 −0

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

			@Override
			public void recycle() {
			setDescription(null);
			}
	}		}

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

+1 −0

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

	@Override		@Override
	public void recycle() {		public void recycle() {
			super.recycle();
	mFinished = false;		mFinished = false;
	mConfigChanges = 0;		mConfigChanges = 0;
	ObjectPool.recycle(this);		ObjectPool.recycle(this);

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

+1 −0

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

	@Override		@Override
	public void recycle() {		public void recycle() {
			super.recycle();
	mFinished = false;		mFinished = false;
	mUserLeaving = false;		mUserLeaving = false;
	mConfigChanges = 0;		mConfigChanges = 0;

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

+1 −0

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

	@Override		@Override
	public void recycle() {		public void recycle() {
			super.recycle();
	mProcState = ActivityManager.PROCESS_STATE_UNKNOWN;		mProcState = ActivityManager.PROCESS_STATE_UNKNOWN;
	mUpdateProcState = false;		mUpdateProcState = false;
	mIsForward = false;		mIsForward = false;

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

+1 −0

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

	@Override		@Override
	public void recycle() {		public void recycle() {
			super.recycle();
	mShowWindow = false;		mShowWindow = false;
	mConfigChanges = 0;		mConfigChanges = 0;
	ObjectPool.recycle(this);		ObjectPool.recycle(this);