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

Commit fea6f7b7 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Remove long standing debug code 

Because it stops real errors from bubbling up to the calling app.

Test: make, post notifications
Change-Id: I0e59c61b0a60302a5fd023b7ad909e84b97e5df5
Fixes: 37494547
parent 0db9724b

core/java/android/app/INotificationManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ interface INotificationManager 
    void enqueueToast(String pkg, ITransientNotification callback, int duration);

    void cancelToast(String pkg, ITransientNotification callback);

    void enqueueNotificationWithTag(String pkg, String opPkg, String tag, int id,

            in Notification notification, inout int[] idReceived, int userId);

            in Notification notification, int userId);

    void cancelNotificationWithTag(String pkg, String tag, int id, int userId);



    void setShowBadge(String pkg, int uid, boolean showBadge);

core/java/android/app/NotificationManager.java

+1 −5
Original line number Diff line number Diff line
@@ -298,7 +298,6 @@ public class NotificationManager 
     */

    public void notifyAsUser(String tag, int id, Notification notification, UserHandle user)

    {

        int[] idOut = new int[1];

        INotificationManager service = getService();

        String pkg = mContext.getPackageName();

        // Fix the notification as best we can.
@@ -320,10 +319,7 @@ public class NotificationManager 
        final Notification copy = Builder.maybeCloneStrippedForDelivery(notification);

        try {

            service.enqueueNotificationWithTag(pkg, mContext.getOpPackageName(), tag, id,

                    copy, idOut, user.getIdentifier());

            if (localLOGV && id != idOut[0]) {

                Log.v(TAG, "notify: id corrupted: sent " + id + ", got back " + idOut[0]);

            }

                    copy, user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

services/core/java/com/android/server/accounts/AccountManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -5006,7 +5006,7 @@ public class AccountManagerService 
            INotificationManager notificationManager = mInjector.getNotificationManager();

            try {

                notificationManager.enqueueNotificationWithTag(packageName, packageName,

                        id.mTag, id.mId, notification, new int[1], userId);

                        id.mTag, id.mId, notification, userId);

            } catch (RemoteException e) {

                /* ignore - local call */

            }

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

+2 −4
Original line number Diff line number Diff line
@@ -2114,10 +2114,9 @@ public class ActivityManagerService extends IActivityManager.Stub 
                                    new UserHandle(root.userId)))

                            .build();

                    try {

                        int[] outId = new int[1];

                        inm.enqueueNotificationWithTag("android", "android", null,

                                SystemMessage.NOTE_HEAVY_WEIGHT_NOTIFICATION,

                                notification, outId, root.userId);

                                notification, root.userId);

                    } catch (RuntimeException e) {

                        Slog.w(ActivityManagerService.TAG,

                                "Error showing notification for heavy-weight app", e);
@@ -2369,10 +2368,9 @@ public class ActivityManagerService extends IActivityManager.Stub 
                        .build();















                try {













                    int[] outId = new int[1];















                    inm.enqueueNotificationWithTag("android", "android", null,















                            SystemMessage.NOTE_DUMP_HEAP_NOTIFICATION,













                            notification, outId, userId);













                            notification, userId);















                } catch (RuntimeException e) {















                    Slog.w(ActivityManagerService.TAG,















                            "Error showing notification for dump heap", e);

























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



+1
−2




























Original line number
Diff line number
Diff line








@@ -524,10 +524,9 @@ final class ServiceRecord extends Binder {













                            throw new RuntimeException("invalid service notification: "















                                    + foregroundNoti);















                        }













                        int[] outId = new int[1];















                        nm.enqueueNotification(localPackageName, localPackageName,















                                appUid, appPid, null, localForegroundId, localForegroundNoti,













                                outId, userId);













                                userId);































                        foregroundNoti = localForegroundNoti; // save it for amending next time















                    } catch (RuntimeException e) {