Merge "Remove temporary logging." into pi-dev (216b50ad) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+0 −58

Original line number	Diff line number	Diff line
		@@ -173,7 +173,6 @@ import java.net.InetAddress;
		import java.text.DateFormat;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Iterator;
		import java.util.List;
		import java.util.Locale;
		import java.util.Map;
		@@ -223,9 +222,6 @@ public final class ActivityThread extends ClientTransactionHandler {
		// Whether to invoke an activity callback after delivering new configuration.
		private static final boolean REPORT_TO_ACTIVITY = true;

		// Maximum number of recent tokens to maintain for debugging purposes
		private static final int MAX_DESTROYED_ACTIVITIES = 10;

		/**
		* Denotes an invalid sequence number corresponding to a process state change.
		*/
		@@ -258,8 +254,6 @@ public final class ActivityThread extends ClientTransactionHandler {
		final H mH = new H();
		final Executor mExecutor = new HandlerExecutor(mH);
		final ArrayMap<IBinder, ActivityClientRecord> mActivities = new ArrayMap<>();
		final ArrayList<DestroyedActivityInfo> mRecentDestroyedActivities = new ArrayList<>();

		// List of new activities (via ActivityRecord.nextIdle) that should
		// be reported when next we idle.
		ActivityClientRecord mNewActivities = null;
		@@ -341,26 +335,6 @@ public final class ActivityThread extends ClientTransactionHandler {
		}
		}

		/**
		* TODO(b/71506345): Remove this once bug is resolved.
		*/
		private static final class DestroyedActivityInfo {
		private final Integer mToken;
		private final String mReason;
		private final long mTime;

		DestroyedActivityInfo(Integer token, String reason) {
		mToken = token;
		mReason = reason;
		mTime = System.currentTimeMillis();
		}

		void dump(PrintWriter pw, String prefix) {
		pw.println(prefix + "[token:" + mToken + " \| time:" + mTime + " \| reason:" + mReason
		+ "]");
		}
		}

		// The lock of mProviderMap protects the following variables.
		final ArrayMap<ProviderKey, ProviderClientRecord> mProviderMap
		= new ArrayMap<ProviderKey, ProviderClientRecord>();
		@@ -2195,32 +2169,6 @@ public final class ActivityThread extends ClientTransactionHandler {
		pw.println(String.format(format, objs));
		}

		@Override
		public void dump(PrintWriter pw, String prefix) {
		pw.println(prefix + "Activities:");

		if (!mActivities.isEmpty()) {
		final Iterator<Map.Entry<IBinder, ActivityClientRecord>> activitiesIterator =
		mActivities.entrySet().iterator();

		while (activitiesIterator.hasNext()) {
		final ArrayMap.Entry<IBinder, ActivityClientRecord> entry =
		activitiesIterator.next();
		pw.println(prefix + " [token:" + entry.getKey().hashCode() + " record:"
		+ entry.getValue().toString() + "]");
		}
		}

		if (!mRecentDestroyedActivities.isEmpty()) {
		pw.println(prefix + "Recent destroyed activities:");
		for (int i = 0, size = mRecentDestroyedActivities.size(); i < size; i++) {
		final DestroyedActivityInfo info = mRecentDestroyedActivities.get(i);
		pw.print(prefix);
		info.dump(pw, " ");
		}
		}
		}

		public static void dumpMemInfoTable(PrintWriter pw, Debug.MemoryInfo memInfo, boolean checkin,
		boolean dumpFullInfo, boolean dumpDalvik, boolean dumpSummaryOnly,
		int pid, String processName,
		@@ -4473,12 +4421,6 @@ public final class ActivityThread extends ClientTransactionHandler {
		r.setState(ON_DESTROY);
		}
		mActivities.remove(token);
		mRecentDestroyedActivities.add(0, new DestroyedActivityInfo(token.hashCode(), reason));

		final int recentDestroyedActivitiesSize = mRecentDestroyedActivities.size();
		if (recentDestroyedActivitiesSize > MAX_DESTROYED_ACTIVITIES) {
		mRecentDestroyedActivities.remove(recentDestroyedActivitiesSize - 1);
		}
		StrictMode.decrementExpectedActivityCount(activityClass);
		return r;
		}

core/java/android/app/ClientTransactionHandler.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import android.util.MergedConfiguration;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.content.ReferrerIntent;

		import java.io.PrintWriter;
		import java.util.List;

		/**
		@@ -192,11 +191,4 @@ public abstract class ClientTransactionHandler {
		* Used to check if we should report relaunch to WM.
		* */
		public abstract void reportRelaunch(IBinder token, PendingTransactionActions pendingActions);

		/**
		* Debugging output.
		* @param pw {@link PrintWriter} to write logs to.
		* @param prefix Prefix to prepend to output.
		*/
		public abstract void dump(PrintWriter pw, String prefix);
		}

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

+1 −39

Original line number	Diff line number	Diff line
		@@ -17,9 +17,7 @@
		package android.app.servertransaction;

		import android.annotation.IntDef;
		import android.os.Parcel;

		import java.io.PrintWriter;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;

		@@ -28,7 +26,6 @@ import java.lang.annotation.RetentionPolicy;
		* @hide
		*/
		public abstract class ActivityLifecycleItem extends ClientTransactionItem {
		private String mDescription;

		@IntDef(prefix = { "UNDEFINED", "PRE_", "ON_" }, value = {
		UNDEFINED,
		@@ -57,43 +54,8 @@ public abstract class ActivityLifecycleItem extends ClientTransactionItem {
		@LifecycleState
		public abstract int getTargetState();


		protected ActivityLifecycleItem() {
		}

		protected ActivityLifecycleItem(Parcel in) {
		mDescription = in.readString();
		}

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeString(mDescription);
		}

		/**
		* Sets a description that can be retrieved later for debugging purposes.
		* @param description Description to set.
		* @return The {@link ActivityLifecycleItem}.
		*/
		public ActivityLifecycleItem setDescription(String description) {
		mDescription = description;
		return this;
		}

		/**
		* Retrieves description if set through {@link #setDescription(String)}.
		*/
		public String getDescription() {
		return mDescription;
		}

		void dump(PrintWriter pw, String prefix) {
		pw.println(prefix + "target state:" + getTargetState());
		pw.println(prefix + "description: " + mDescription);
		}

		/** Called by subclasses to make sure base implementation is cleaned up */
		@Override
		public void recycle() {
		setDescription(null);
		}
		}

core/java/android/app/servertransaction/ClientTransaction.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import android.os.RemoteException;

		import com.android.internal.annotations.VisibleForTesting;

		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.List;
		import java.util.Objects;
		@@ -238,12 +237,4 @@ public class ClientTransaction implements Parcelable, ObjectPoolItem {
		result = 31 * result + Objects.hashCode(mLifecycleStateRequest);
		return result;
		}

		void dump(PrintWriter pw, String prefix) {
		pw.println(prefix + "mActivityToken:" + mActivityToken.hashCode());
		pw.println(prefix + "mLifecycleStateRequest:");
		if (mLifecycleStateRequest != null) {
		mLifecycleStateRequest.dump(pw, prefix + " ");
		}
		}
		}

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ public class DestroyActivityItem extends ActivityLifecycleItem {
		PendingTransactionActions pendingActions) {
		Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "activityDestroy");
		client.handleDestroyActivity(token, mFinished, mConfigChanges,
		false /* getNonConfigInstance */, getDescription());
		false /* getNonConfigInstance */, "DestroyActivityItem");
		Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
		}

		@@ -77,14 +77,12 @@ public class DestroyActivityItem extends ActivityLifecycleItem {
		/** Write to Parcel. */
		@Override
		public void writeToParcel(Parcel dest, int flags) {
		super.writeToParcel(dest, flags);
		dest.writeBoolean(mFinished);
		dest.writeInt(mConfigChanges);
		}

		/** Read from Parcel. */
		private DestroyActivityItem(Parcel in) {
		super(in);
		mFinished = in.readBoolean();
		mConfigChanges = in.readInt();
		}