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

Unverified Commit 56241850 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Revert "Crash app on foreground service notification error." 

This reverts commit d1a8aade.

The change was originally picked from aosp master. It is corrected much
more throughly by the backported fix in
I94d9de50bb03c33666471e3dbd9c721e9278f7cb

Change-Id: I4a149ce06d4e6275f7da266f6f85836c1a93f902
parent fa0acf56

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

+2 −16
Original line number Diff line number Diff line
@@ -808,22 +808,8 @@ public class NotificationManagerService extends SystemService { 
        @Override

        public void onNotificationError(int callingUid, int callingPid, String pkg, String tag, int id,

                int uid, int initialPid, String message, int userId) {

            final boolean fgService;

            synchronized (mNotificationLock) {

                NotificationRecord r = findNotificationLocked(pkg, tag, id, userId);

                fgService = r != null && (r.getNotification().flags & FLAG_FOREGROUND_SERVICE) != 0;

            }

            cancelNotification(callingUid, callingPid, pkg, tag, id, 0, 0,

                    false, userId, REASON_ERROR, null);

            if (fgService) {

                // Still crash for foreground services, preventing the not-crash behaviour abused

                // by apps to give us a garbage notification and silently start a fg service.

                Binder.withCleanCallingIdentity(

                        () -> mAm.crashApplication(uid, initialPid, pkg, -1,

                            "Bad notification(tag=" + tag + ", id=" + id + ") posted from package "

                                + pkg + ", crashing app(uid=" + uid + ", pid=" + initialPid + "): "

                                + message));

            }

            cancelNotification(callingUid, callingPid, pkg, tag, id, 0, 0, false, userId,

                    REASON_ERROR, null);

        }



        @Override