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

Commit 2f1d2e64 authored by Bernardo Rufino's avatar Bernardo Rufino Committed by Automerger Merge Worker
Browse files

Merge "Remove warning trampoline toast for beta" into sc-dev am: 26d32569 

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

Change-Id: I18943c5b91a9dbecf5811f6db774f301990e7cb6
parents 315c6369 26d32569

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

+4 −11
Original line number Diff line number Diff line
@@ -10675,8 +10675,6 @@ public class NotificationManagerService extends SystemService { 
     * TODO(b/161957908): Remove dogfooder toast.

     */

    private class NotificationTrampolineCallback implements BackgroundActivityStartCallback {

        private final Set<String> mPackagesShown = new ArraySet<>();



        @Override

        public boolean isActivityStartAllowed(Collection<IBinder> tokens, int uid,

                String packageName) {
@@ -10689,16 +10687,12 @@ public class NotificationManagerService extends SystemService { 
            }

            String logcatMessage =

                    "Indirect notification activity start (trampoline) from " + packageName;

            // Call to toast() method is posted to mHandler below to offload PM lookup from the

            // activity start path

            if (CompatChanges.isChangeEnabled(NOTIFICATION_TRAMPOLINE_BLOCK, uid)) {

                mHandler.post(() -> toast(packageName, uid, /* blocked */ true));

                // 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 {

                if (mPackagesShown.add(packageName)) {

                    mHandler.post(() -> toast(packageName, uid, /* blocked */ false));

                }

                Slog.w(TAG, logcatMessage + ", this should be avoided for performance reasons");

                return true;

            }
@@ -10713,7 +10707,7 @@ public class NotificationManagerService extends SystemService { 
                    && !CompatChanges.isChangeEnabled(NOTIFICATION_TRAMPOLINE_BLOCK, uid);

        }



        private void toast(String packageName, int uid, boolean blocked) {

        private void toast(String packageName, int uid) {

            final CharSequence label;

            try {

                label = mPackageManagerClient.getApplicationLabel(
@@ -10724,8 +10718,7 @@ public class NotificationManagerService extends SystemService { 
                return;

            }

            mUiHandler.post(() -> Toast.makeText(getUiContext(),

                    label + " launch " + (blocked ? "blocked" : "will be blocked")

                            + "\ng.co/dev/trampolines", Toast.LENGTH_LONG).show());

                    label + " launch blocked\ng.co/dev/trampolines", Toast.LENGTH_LONG).show());

        }

    }

}