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

Commit 693377c3 authored Apr 03, 2023 by Jeff Sharkey Committed by Automerger Merge Worker Apr 03, 2023

Merge "Shift IntentFilter.toString() for RAM regression." into udc-dev am:...

Merge "Shift IntentFilter.toString() for RAM regression." into udc-dev am: d1306c39 am: 76c4ddb6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22431203

Change-Id: I6ef4b617471ce3e15b6c9ecc93990c38b96def9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents a2fa97f9 76c4ddb6

core/java/android/content/IntentFilter.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -531,8 +531,9 @@ public class IntentFilter implements Parcelable {
		mInstantAppVisibility = o.mInstantAppVisibility;
		}

		/** {@inheritDoc} */
		public String toString() {
		/** @hide */
		public String toLongString() {
		// Not implemented directly as toString() due to potential memory regression
		final StringBuilder sb = new StringBuilder();
		sb.append("IntentFilter {");
		sb.append(" pri=");

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -13651,7 +13651,8 @@ public class ActivityManagerService extends IActivityManager.Stub
		\|\| action.startsWith("android.intent.action.UID_")
		\|\| action.startsWith("android.intent.action.EXTERNAL_")) {
		if (DEBUG_BROADCAST) {
		Slog.wtf(TAG, "System internals registering for " + filter
		Slog.wtf(TAG,
		"System internals registering for " + filter.toLongString()
		+ " with app priority; this will race with apps!",
		new Throwable());
		}