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

Merge "Fix notification ordering for groups"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-20 19:31:09 +00:00
committed by Android (Google) Code Review
parent 11432662f8 bbc469ceca
commit 522db91607
5 changed files with 68 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/notification/NotificationIntrusivenessExtractor.java
View File

@@ -16,14 +16,14 @@
package com.android.server.notification;
import android.app.Notification;
import android.app.NotificationManager;
import android.content.Context;
import android.net.Uri;
import android.service.notification.NotificationListenerService;
import android.util.Log;
import android.util.Slog;
import com.android.internal.annotations.VisibleForTesting;
/**
* This {@link com.android.server.notification.NotificationSignalExtractor} notices noisy
* notifications and marks them to get a temporary ranking bump.
@@ -34,7 +34,8 @@ public class NotificationIntrusivenessExtractor implements NotificationSignalExt
/** Length of time (in milliseconds) that an intrusive or noisy notification will stay at
the top of the ranking order, before it falls back to its natural position. */
private static final long HANG_TIME_MS = 10000;
@VisibleForTesting
static final long HANG_TIME_MS = 10000;
public void initialize(Context ctx, NotificationUsageStats usageStats) {
if (DBG) Slog.d(TAG, "Initializing " + getClass().getSimpleName() + ".");
@@ -46,7 +47,8 @@ public class NotificationIntrusivenessExtractor implements NotificationSignalExt
return null;
}
if (record.getImportance() >= NotificationManager.IMPORTANCE_DEFAULT) {
if (record.getFreshnessMs(System.currentTimeMillis()) < HANG_TIME_MS
&& record.getImportance() >= NotificationManager.IMPORTANCE_DEFAULT) {
if (record.getSound() != null && record.getSound() != Uri.EMPTY) {
record.setRecentlyIntrusive(true);
}

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

@@ -3002,9 +3002,11 @@ public class NotificationManagerService extends SystemService {
if (r == null) {
return;
}
addAutoGroupAdjustment(r, GroupHelper.AUTOGROUP_KEY);
EventLogTags.writeNotificationAutogrouped(key);
mRankingHandler.requestSort();
if (r.sbn.getOverrideGroupKey() == null) {
addAutoGroupAdjustment(r, GroupHelper.AUTOGROUP_KEY);
EventLogTags.writeNotificationAutogrouped(key);
mRankingHandler.requestSort();
}
}
@GuardedBy("mNotificationLock")
@@ -3013,9 +3015,11 @@ public class NotificationManagerService extends SystemService {
if (r == null) {
return;
}
addAutoGroupAdjustment(r, null);
EventLogTags.writeNotificationUnautogrouped(key);
mRankingHandler.requestSort();
if (r.sbn.getOverrideGroupKey() != null) {
addAutoGroupAdjustment(r, null);
EventLogTags.writeNotificationUnautogrouped(key);
mRankingHandler.requestSort();
}
}
private void addAutoGroupAdjustment(NotificationRecord r, String overrideGroupKey) {

3
services/core/java/com/android/server/notification/RankingHelper.java
View File

@@ -427,8 +427,7 @@ public class RankingHelper implements RankingConfig {
record.setAuthoritativeRank(i);
final String groupKey = record.getGroupKey();
NotificationRecord existingProxy = mProxyByGroupTmp.get(groupKey);
if (existingProxy == null
|| record.getImportance() > existingProxy.getImportance()) {
if (existingProxy == null) {
mProxyByGroupTmp.put(groupKey, record);
}
}

25
services/tests/notification/src/com/android/server/notification/NotificationIntrusivenessExtractorTest.java
View File

@@ -19,6 +19,9 @@ package com.android.server.notification;
import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static com.android.server.notification.NotificationIntrusivenessExtractor.HANG_TIME_MS;
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertNull;
@@ -59,9 +62,29 @@ public class NotificationIntrusivenessExtractorTest extends NotificationTestCase
Notification n = builder.build();
StatusBarNotification sbn = new StatusBarNotification("", "", 0, "", 0,
0, n, UserHandle.ALL, null, System.currentTimeMillis());
0, n, UserHandle.ALL, null,
System.currentTimeMillis());
NotificationRecord r = new NotificationRecord(getContext(), sbn, channel);
assertNotNull(new NotificationIntrusivenessExtractor().process(r));
}
@Test
public void testOldNotificationsNotIntrusive() {
NotificationChannel channel = new NotificationChannel("a", "a", IMPORTANCE_DEFAULT);
final Notification.Builder builder = new Notification.Builder(getContext())
.setContentTitle("foo")
.setFullScreenIntent(PendingIntent.getActivity(
getContext(), 0, new Intent(""), 0), true)
.setSmallIcon(android.R.drawable.sym_def_app_icon);
Notification n = builder.build();
StatusBarNotification sbn = new StatusBarNotification("", "", 0, "", 0,
0, n, UserHandle.ALL, null,
System.currentTimeMillis() - HANG_TIME_MS);
NotificationRecord r = new NotificationRecord(getContext(), sbn, channel);
assertNull(new NotificationIntrusivenessExtractor().process(r));
assertFalse(r.isRecentlyIntrusive());
}
}

29
services/tests/notification/src/com/android/server/notification/NotificationManagerServiceTest.java
View File

@@ -1391,16 +1391,41 @@ public class NotificationManagerServiceTest extends NotificationTestCase {
}
@Test
public void testModifyAutogroup_requestsSort() throws Exception {
public void testAddAutogroup_requestsSort() throws Exception {
RankingHandler rh = mock(RankingHandler.class);
mNotificationManagerService.setRankingHandler(rh);
final NotificationRecord r = generateNotificationRecord(mTestNotificationChannel);
mNotificationManagerService.addNotification(r);
mNotificationManagerService.addAutogroupKeyLocked(r.getKey());
verify(rh, times(1)).requestSort();
}
@Test
public void testRemoveAutogroup_requestsSort() throws Exception {
RankingHandler rh = mock(RankingHandler.class);
mNotificationManagerService.setRankingHandler(rh);
final NotificationRecord r = generateNotificationRecord(mTestNotificationChannel);
r.setOverrideGroupKey("TEST");
mNotificationManagerService.addNotification(r);
mNotificationManagerService.removeAutogroupKeyLocked(r.getKey());
verify(rh, times(2)).requestSort();
verify(rh, times(1)).requestSort();
}
@Test
public void testReaddAutogroup_noSort() throws Exception {
RankingHandler rh = mock(RankingHandler.class);
mNotificationManagerService.setRankingHandler(rh);
final NotificationRecord r = generateNotificationRecord(mTestNotificationChannel);
r.setOverrideGroupKey("TEST");
mNotificationManagerService.addNotification(r);
mNotificationManagerService.addAutogroupKeyLocked(r.getKey());
verify(rh, never()).requestSort();
}
@Test