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

Commit c1d93cf4 authored by Christoph Studer's avatar Christoph Studer Committed by android-build-merger
Browse files

Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev automerge: 68572030 

automerge: 3fc81180

* commit '3fc81180':
  NoMan: Add update bit to notification_enqueue log
parents 0b695be1 3fc81180

services/core/java/com/android/server/EventLogTags.logtags

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ option java_package com.android.server 
# NotificationManagerService.java

# ---------------------------

# when a NotificationManager.notify is called

2750 notification_enqueue (uid|1|5),(pid|1|5),(pkg|3),(id|1|5),(tag|3),(userid|1|5),(notification|3)

2750 notification_enqueue (uid|1|5),(pid|1|5),(pkg|3),(id|1|5),(tag|3),(userid|1|5),(notification|3),(update|1)

# when someone tries to cancel a notification, the notification manager sometimes

# calls this with flags too

2751 notification_cancel (uid|1|5),(pid|1|5),(pkg|3),(id|1|5),(tag|3),(userid|1|5),(required_flags|1),(forbidden_flags|1),(reason|1|5),(listener|3)

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

+8 −8
Original line number Diff line number Diff line
@@ -1712,14 +1712,6 @@ public class NotificationManagerService extends SystemService { 
            }

        }



        // This conditional is a dirty hack to limit the logging done on

        //     behalf of the download manager without affecting other apps.

        if (!pkg.equals("com.android.providers.downloads")

                || Log.isLoggable("DownloadManager", Log.VERBOSE)) {

            EventLogTags.writeNotificationEnqueue(callingUid, callingPid,

                    pkg, id, tag, userId, notification.toString());

        }



        if (pkg == null || notification == null) {

            throw new IllegalArgumentException("null not allowed: pkg=" + pkg

                    + " id=" + id + " notification=" + notification);
@@ -1769,6 +1761,14 @@ public class NotificationManagerService extends SystemService { 
                    }

                    mRankingHelper.extractSignals(r);



                    // This conditional is a dirty hack to limit the logging done on

                    //     behalf of the download manager without affecting other apps.

                    if (!pkg.equals("com.android.providers.downloads")

                            || Log.isLoggable("DownloadManager", Log.VERBOSE)) {

                        EventLogTags.writeNotificationEnqueue(callingUid, callingPid,

                                pkg, id, tag, userId, notification.toString(),

                                (old != null) ? 1 : 0);

                    }

                    // 3. Apply local rules



                    // blocked apps