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

Merge changes I01afb5e9,I90d1adaf into nyc-dev

Browse Source 
* changes:
  Add content intent to autogroup summary.
  Logging for ranker bundling.
This commit is contained in:
Julia Reynolds
2016-04-19 12:50:32 +00:00
committed by Android (Google) Code Review
parent 882a0802a7 5bba3e7cd3
commit 3da3d7f455
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,6 +80,10 @@ option java_package com.android.server
27531 notification_visibility (key|3),(visibile|1),(lifespan|1),(freshness|1),(exposure|1),(rank|1) 27531 notification_visibility (key|3),(visibile|1),(lifespan|1),(freshness|1),(exposure|1),(rank|1)
# a notification emited noise, vibration, or light # a notification emited noise, vibration, or light
27532 notification_alert (key|3),(buzz|1),(beep|1),(blink|1) 27532 notification_alert (key|3),(buzz|1),(beep|1),(blink|1)
# a notification was added to a autogroup
27533 notification_autogrouped (key|3)
# notification was removed from an autogroup
275534 notification_unautogrouped (key|3)
# --------------------------- # ---------------------------
# Watchdog.java # Watchdog.java

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

@@ -2179,8 +2179,14 @@ public class NotificationManagerService extends SystemService {
} }
if (adjustment.getSignals() != null) { if (adjustment.getSignals() != null) {
Bundle.setDefusable(adjustment.getSignals(), true); Bundle.setDefusable(adjustment.getSignals(), true);
n.sbn.setOverrideGroupKey(adjustment.getSignals().getString( final String autoGroupKey = adjustment.getSignals().getString(
Adjustment.GROUP_KEY_OVERRIDE_KEY, null)); Adjustment.GROUP_KEY_OVERRIDE_KEY, null);
if (autoGroupKey == null) {
EventLogTags.writeNotificationUnautogrouped(adjustment.getKey());
} else {
EventLogTags.writeNotificationAutogrouped(adjustment.getKey());
}
n.sbn.setOverrideGroupKey(autoGroupKey);
} }
} }
@@ -2233,6 +2239,13 @@ public class NotificationManagerService extends SystemService {
.setFlag(Notification.FLAG_GROUP_SUMMARY, true) .setFlag(Notification.FLAG_GROUP_SUMMARY, true)
.build(); .build();
summaryNotification.extras.putAll(extras); summaryNotification.extras.putAll(extras);
Intent appIntent = getContext().getPackageManager()
.getLaunchIntentForPackage(adjustment.getPackage());
if (appIntent != null) {
summaryNotification.contentIntent = PendingIntent.getActivityAsUser(
getContext(), 0, appIntent, 0, null,
UserHandle.of(adjustedSbn.getUserId()));
}
final StatusBarNotification summarySbn = final StatusBarNotification summarySbn =
new StatusBarNotification(adjustedSbn.getPackageName(), new StatusBarNotification(adjustedSbn.getPackageName(),
adjustedSbn.getOpPkg(), adjustedSbn.getOpPkg(),