Merge "Remove trampoline toast" into sc-dev (80e8dc21) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/notification/NotificationManagerService.java

+0 −16

Original line number	Diff line number	Diff line
		@@ -11073,8 +11073,6 @@ public class NotificationManagerService extends SystemService {
		String logcatMessage =
		"Indirect notification activity start (trampoline) from " + packageName;
		if (blockTrampoline(uid)) {
		// Post toast() call to mHandler to offload PM lookup from the activity start path
		mHandler.post(() -> toast(packageName, uid));
		Slog.e(TAG, logcatMessage + " blocked");
		return false;
		} else {
		@@ -11098,19 +11096,5 @@ public class NotificationManagerService extends SystemService {
		return tokens.contains(ALLOWLIST_TOKEN)
		&& !CompatChanges.isChangeEnabled(NOTIFICATION_TRAMPOLINE_BLOCK, uid);
		}

		private void toast(String packageName, int uid) {
		final CharSequence label;
		try {
		label = mPackageManagerClient.getApplicationLabel(
		mPackageManager.getApplicationInfo(packageName, 0,
		UserHandle.getUserId(uid)));
		} catch (RemoteException e) {
		Slog.e(TAG, "Unexpected exception obtaining app label from PackageManager", e);
		return;
		}
		mUiHandler.post(() -> Toast.makeText(getUiContext(),
		label + " launch blocked\ng.co/dev/trampolines", Toast.LENGTH_LONG).show());
		}
		}
		}