Merge "More detailed logging to aid debugging." into udc-dev (d5ef486c) · Commits · e / os / android_frameworks_base

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

+8 −4

Original line number	Diff line number	Diff line
		@@ -393,6 +393,10 @@ class BroadcastProcessQueue {
		setProcessInstrumented(false);
		setProcessPersistent(false);
		}

		// Since we may have just changed our PID, invalidate cached strings
		mCachedToString = null;
		mCachedToShortString = null;
		}

		/**
		@@ -1128,16 +1132,16 @@ class BroadcastProcessQueue {
		@Override
		public String toString() {
		if (mCachedToString == null) {
		mCachedToString = "BroadcastProcessQueue{"
		+ Integer.toHexString(System.identityHashCode(this))
		+ " " + processName + "/" + UserHandle.formatUid(uid) + "}";
		mCachedToString = "BroadcastProcessQueue{" + toShortString() + "}";
		}
		return mCachedToString;
		}

		public String toShortString() {
		if (mCachedToShortString == null) {
		mCachedToShortString = processName + "/" + UserHandle.formatUid(uid);
		mCachedToShortString = Integer.toHexString(System.identityHashCode(this))
		+ " " + ((app != null) ? app.getPid() : "?") + ":" + processName + "/"
		+ UserHandle.formatUid(uid);
		}
		return mCachedToShortString;
		}

+2 −4

Original line number	Diff line number	Diff line
		@@ -1068,9 +1068,7 @@ final class BroadcastRecord extends Binder {
		if (label == null) {
		label = intent.toString();
		}
		mCachedToString = "BroadcastRecord{"
		+ Integer.toHexString(System.identityHashCode(this))
		+ " u" + userId + " " + label + "}";
		mCachedToString = "BroadcastRecord{" + toShortString() + "}";
		}
		return mCachedToString;
		}
		@@ -1082,7 +1080,7 @@ final class BroadcastRecord extends Binder {
		label = intent.toString();
		}
		mCachedToShortString = Integer.toHexString(System.identityHashCode(this))
		+ ":" + label + "/u" + userId;
		+ " " + label + "/u" + userId;
		}
		return mCachedToShortString;
		}