Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: 6857203

* commit '685720309a582acc513454d674f82368479c5297':
  NoMan: Add update bit to notification_enqueue log
This commit is contained in:
Christoph Studer
2014-10-28 12:45:50 +00:00
committed by android-build-merger
parent 35bedd19d4 685720309a
commit 3fc811803d
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/EventLogTags.logtags
View File

@@ -52,7 +52,7 @@ option java_package com.android.server
# NotificationManagerService.java # NotificationManagerService.java
# --------------------------- # ---------------------------
# when a NotificationManager.notify is called # 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 # when someone tries to cancel a notification, the notification manager sometimes
# calls this with flags too # 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) 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)

16
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -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) { if (pkg == null || notification == null) {
throw new IllegalArgumentException("null not allowed: pkg=" + pkg throw new IllegalArgumentException("null not allowed: pkg=" + pkg
+ " id=" + id + " notification=" + notification); + " id=" + id + " notification=" + notification);
@@ -1769,6 +1761,14 @@ public class NotificationManagerService extends SystemService {
} }
mRankingHelper.extractSignals(r); 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 // 3. Apply local rules
// blocked apps // blocked apps