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

Merge "Do not bundle cross user." into nyc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2016-05-11 17:20:15 +00:00
committed by Android (Google) Code Review
parent 0ccd9cef14 eae43fbd17
commit 68a32b5aad
4 changed files with 68 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/system-current.txt
View File

@@ -37327,7 +37327,7 @@ package android.service.media {
package android.service.notification {
public final class Adjustment implements android.os.Parcelable {
ctor public Adjustment(java.lang.String, java.lang.String, int, android.os.Bundle, java.lang.CharSequence, android.net.Uri);
ctor public Adjustment(java.lang.String, java.lang.String, int, android.os.Bundle, java.lang.CharSequence, android.net.Uri, int);
ctor protected Adjustment(android.os.Parcel);
method public int describeContents();
method public java.lang.CharSequence getExplanation();
@@ -37336,6 +37336,7 @@ package android.service.notification {
method public java.lang.String getPackage();
method public android.net.Uri getReference();
method public android.os.Bundle getSignals();
method public int getUser();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.service.notification.Adjustment> CREATOR;
field public static final java.lang.String GROUP_KEY_OVERRIDE_KEY = "group_key_override";

10
core/java/android/service/notification/Adjustment.java
View File

@@ -34,6 +34,7 @@ public final class Adjustment implements Parcelable {
private final CharSequence mExplanation;
private final Uri mReference;
private final Bundle mSignals;
private final int mUser;
public static final String GROUP_KEY_OVERRIDE_KEY = "group_key_override";
public static final String NEEDS_AUTOGROUPING_KEY = "autogroup_needed";
@@ -52,13 +53,14 @@ public final class Adjustment implements Parcelable {
* or null.
*/
public Adjustment(String pkg, String key, int importance, Bundle signals,
CharSequence explanation, Uri reference) {
CharSequence explanation, Uri reference, int user) {
mPackage = pkg;
mKey = key;
mImportance = importance;
mSignals = signals;
mExplanation = explanation;
mReference = reference;
mUser = user;
}
protected Adjustment(Parcel in) {
@@ -80,6 +82,7 @@ public final class Adjustment implements Parcelable {
}
mReference = in.readParcelable(Uri.class.getClassLoader());
mSignals = in.readBundle();
mUser = in.readInt();
}
public static final Creator<Adjustment> CREATOR = new Creator<Adjustment>() {
@@ -118,6 +121,10 @@ public final class Adjustment implements Parcelable {
return mSignals;
}
public int getUser() {
return mUser;
}
@Override
public int describeContents() {
return 0;
@@ -146,5 +153,6 @@ public final class Adjustment implements Parcelable {
}
dest.writeParcelable(mReference, flags);
dest.writeBundle(mSignals);
dest.writeInt(mUser);
}
}

57
packages/ExtServices/src/android/ext/services/notification/Ranker.java
View File

@@ -19,6 +19,7 @@ package android.ext.services.notification;
import static android.service.notification.NotificationListenerService.Ranking.IMPORTANCE_UNSPECIFIED;
import android.os.Bundle;
import android.os.UserHandle;
import android.service.notification.Adjustment;
import android.service.notification.NotificationRankerService;
import android.service.notification.StatusBarNotification;
@@ -43,9 +44,9 @@ public final class Ranker extends NotificationRankerService {
private static final int AUTOBUNDLE_AT_COUNT = 4;
private static final String AUTOBUNDLE_KEY = "ranker_bundle";
// Map of package : notification keys. Only contains notifications that are not bundled
// by the app (aka no group or sort key).
Map<String, LinkedHashSet<String>> mUnbundledNotifications;
// Map of user : <Map of package : notification keys>. Only contains notifications that are not
// bundled by the app (aka no group or sort key).
Map<Integer, Map<String, LinkedHashSet<String>>> mUnbundledNotifications;
@Override
public Adjustment onNotificationEnqueued(StatusBarNotification sbn, int importance,
@@ -63,14 +64,20 @@ public final class Ranker extends NotificationRankerService {
// Not grouped by the app, add to the list of notifications for the app;
// send bundling update if app exceeds the autobundling limit.
synchronized (mUnbundledNotifications) {
Map<String, LinkedHashSet<String>> unbundledNotificationsByUser
= mUnbundledNotifications.get(sbn.getUserId());
if (unbundledNotificationsByUser == null) {
unbundledNotificationsByUser = new HashMap<>();
}
mUnbundledNotifications.put(sbn.getUserId(), unbundledNotificationsByUser);
LinkedHashSet<String> notificationsForPackage
= mUnbundledNotifications.get(sbn.getPackageName());
= unbundledNotificationsByUser.get(sbn.getPackageName());
if (notificationsForPackage == null) {
notificationsForPackage = new LinkedHashSet<>();
}
notificationsForPackage.add(sbn.getKey());
mUnbundledNotifications.put(sbn.getPackageName(), notificationsForPackage);
unbundledNotificationsByUser.put(sbn.getPackageName(), notificationsForPackage);
if (notificationsForPackage.size() >= AUTOBUNDLE_AT_COUNT) {
for (String key : notificationsForPackage) {
@@ -80,12 +87,13 @@ public final class Ranker extends NotificationRankerService {
}
if (notificationsToBundle.size() > 0) {
adjustAutobundlingSummary(sbn.getPackageName(), notificationsToBundle.get(0),
true);
adjustNotificationBundling(sbn.getPackageName(), notificationsToBundle, true);
true, sbn.getUserId());
adjustNotificationBundling(sbn.getPackageName(), notificationsToBundle, true,
sbn.getUserId());
}
} else {
// Grouped, but not by us. Send updates to unautobundle, if we bundled it.
maybeUnbundle(sbn, false);
maybeUnbundle(sbn, false, sbn.getUserId());
}
} catch (Exception e) {
Slog.e(TAG, "Failure processing new notification", e);
@@ -95,7 +103,7 @@ public final class Ranker extends NotificationRankerService {
@Override
public void onNotificationRemoved(StatusBarNotification sbn) {
try {
maybeUnbundle(sbn, true);
maybeUnbundle(sbn, true, sbn.getUserId());
} catch (Exception e) {
Slog.e(TAG, "Error processing canceled notification", e);
}
@@ -106,12 +114,17 @@ public final class Ranker extends NotificationRankerService {
* autobundling if the status change of this notification resulted in the loose notification
* count being under the limit.
*/
private void maybeUnbundle(StatusBarNotification sbn, boolean notificationGone) {
private void maybeUnbundle(StatusBarNotification sbn, boolean notificationGone, int user) {
List<String> notificationsToUnAutobundle = new ArrayList<>();
boolean removeSummary = false;
synchronized (mUnbundledNotifications) {
Map<String, LinkedHashSet<String>> unbundledNotificationsByUser
= mUnbundledNotifications.get(sbn.getUserId());
if (unbundledNotificationsByUser == null || unbundledNotificationsByUser.size() == 0) {
return;
}
LinkedHashSet<String> notificationsForPackage
= mUnbundledNotifications.get(sbn.getPackageName());
= unbundledNotificationsByUser.get(sbn.getPackageName());
if (notificationsForPackage == null || notificationsForPackage.size() == 0) {
return;
}
@@ -132,9 +145,10 @@ public final class Ranker extends NotificationRankerService {
}
if (notificationsToUnAutobundle.size() > 0) {
if (removeSummary) {
adjustAutobundlingSummary(sbn.getPackageName(), null, false);
adjustAutobundlingSummary(sbn.getPackageName(), null, false, user);
}
adjustNotificationBundling(sbn.getPackageName(), notificationsToUnAutobundle, false);
adjustNotificationBundling(sbn.getPackageName(), notificationsToUnAutobundle, false,
user);
}
}
@@ -147,7 +161,8 @@ public final class Ranker extends NotificationRankerService {
}
}
private void adjustAutobundlingSummary(String packageName, String key, boolean summaryNeeded) {
private void adjustAutobundlingSummary(String packageName, String key, boolean summaryNeeded,
int user) {
Bundle signals = new Bundle();
if (summaryNeeded) {
signals.putBoolean(Adjustment.NEEDS_AUTOGROUPING_KEY, true);
@@ -156,7 +171,8 @@ public final class Ranker extends NotificationRankerService {
signals.putBoolean(Adjustment.NEEDS_AUTOGROUPING_KEY, false);
}
Adjustment adjustment = new Adjustment(packageName, key, IMPORTANCE_UNSPECIFIED, signals,
getContext().getString(R.string.notification_ranker_autobundle_explanation), null);
getContext().getString(R.string.notification_ranker_autobundle_explanation), null,
user);
if (DEBUG) {
Log.i(TAG, "Summary update for: " + packageName + " "
+ (summaryNeeded ? "adding" : "removing"));
@@ -168,10 +184,11 @@ public final class Ranker extends NotificationRankerService {
}
}
private void adjustNotificationBundling(String packageName, List<String> keys, boolean bundle) {
private void adjustNotificationBundling(String packageName, List<String> keys, boolean bundle,
int user) {
List<Adjustment> adjustments = new ArrayList<>();
for (String key : keys) {
adjustments.add(createBundlingAdjustment(packageName, key, bundle));
adjustments.add(createBundlingAdjustment(packageName, key, bundle, user));
if (DEBUG) Log.i(TAG, "Sending bundling adjustment for: " + key);
}
try {
@@ -181,7 +198,8 @@ public final class Ranker extends NotificationRankerService {
}
}
private Adjustment createBundlingAdjustment(String packageName, String key, boolean bundle) {
private Adjustment createBundlingAdjustment(String packageName, String key, boolean bundle,
int user) {
Bundle signals = new Bundle();
if (bundle) {
signals.putString(Adjustment.GROUP_KEY_OVERRIDE_KEY, AUTOBUNDLE_KEY);
@@ -189,7 +207,8 @@ public final class Ranker extends NotificationRankerService {
signals.putString(Adjustment.GROUP_KEY_OVERRIDE_KEY, null);
}
return new Adjustment(packageName, key, IMPORTANCE_UNSPECIFIED, signals,
getContext().getString(R.string.notification_ranker_autobundle_explanation), null);
getContext().getString(R.string.notification_ranker_autobundle_explanation),
null, user);
}
}

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

@@ -265,7 +265,7 @@ public class NotificationManagerService extends SystemService {
new ArrayList<NotificationRecord>();
final ArrayMap<String, NotificationRecord> mNotificationsByKey =
new ArrayMap<String, NotificationRecord>();
final ArrayMap<String, String> mAutobundledSummaries = new ArrayMap<>();
final ArrayMap<Integer, ArrayMap<String, String>> mAutobundledSummaries = new ArrayMap<>();
final ArrayList<ToastRecord> mToastQueue = new ArrayList<ToastRecord>();
final ArrayMap<String, NotificationRecord> mSummaryByGroupKey = new ArrayMap<>();
final PolicyAccess mPolicyAccess = new PolicyAccess();
@@ -2196,10 +2196,12 @@ public class NotificationManagerService extends SystemService {
Bundle.setDefusable(adjustment.getSignals(), true);
if (adjustment.getSignals().containsKey(Adjustment.NEEDS_AUTOGROUPING_KEY)
&& !adjustment.getSignals().getBoolean(Adjustment.NEEDS_AUTOGROUPING_KEY, false)) {
if (mAutobundledSummaries.containsKey(adjustment.getPackage())) {
ArrayMap<String, String> summaries =
mAutobundledSummaries.get(adjustment.getUser());
if (summaries != null && summaries.containsKey(adjustment.getPackage())) {
// Clear summary.
final NotificationRecord removed = mNotificationsByKey.get(
mAutobundledSummaries.remove(adjustment.getPackage()));
summaries.remove(adjustment.getPackage()));
if (removed != null) {
mNotificationList.remove(removed);
cancelNotificationLocked(removed, false, REASON_UNAUTOBUNDLED);
@@ -2219,12 +2221,17 @@ public class NotificationManagerService extends SystemService {
int userId = -1;
NotificationRecord summaryRecord = null;
synchronized (mNotificationList) {
if (!mAutobundledSummaries.containsKey(adjustment.getPackage())
final StatusBarNotification adjustedSbn
= mNotificationsByKey.get(adjustment.getKey()).sbn;
userId = adjustedSbn.getUser().getIdentifier();
ArrayMap<String, String> summaries = mAutobundledSummaries.get(userId);
if (summaries == null) {
summaries = new ArrayMap<>();
}
mAutobundledSummaries.put(userId, summaries);
if (!summaries.containsKey(adjustment.getPackage())
&& newAutoBundleKey != null) {
// Add summary
final StatusBarNotification adjustedSbn
= mNotificationsByKey.get(adjustment.getKey()).sbn;
final ApplicationInfo appInfo =
adjustedSbn.getNotification().extras.getParcelable(
Notification.EXTRA_BUILDER_APPLICATION_INFO);
@@ -2244,7 +2251,7 @@ public class NotificationManagerService extends SystemService {
if (appIntent != null) {
summaryNotification.contentIntent = PendingIntent.getActivityAsUser(
getContext(), 0, appIntent, 0, null,
UserHandle.of(adjustedSbn.getUserId()));
UserHandle.of(userId));
}
final StatusBarNotification summarySbn =
new StatusBarNotification(adjustedSbn.getPackageName(),
@@ -2255,8 +2262,7 @@ public class NotificationManagerService extends SystemService {
newAutoBundleKey,
System.currentTimeMillis());
summaryRecord = new NotificationRecord(getContext(), summarySbn);
mAutobundledSummaries.put(adjustment.getPackage(), summarySbn.getKey());
userId = adjustedSbn.getUser().getIdentifier();
summaries.put(adjustment.getPackage(), summarySbn.getKey());
}
}
if (summaryRecord != null) {
@@ -3265,8 +3271,9 @@ public class NotificationManagerService extends SystemService {
if (groupSummary != null && groupSummary.getKey().equals(r.getKey())) {
mSummaryByGroupKey.remove(groupKey);
}
if (r.sbn.getKey().equals(mAutobundledSummaries.get(r.sbn.getPackageName()))) {
mAutobundledSummaries.remove(r.sbn.getPackageName());
final ArrayMap<String, String> summaries = mAutobundledSummaries.get(r.sbn.getUserId());
if (summaries != null && r.sbn.getKey().equals(summaries.get(r.sbn.getPackageName()))) {
summaries.remove(r.sbn.getPackageName());
}
// Save it for users of getHistoricalNotifications()