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

Merge "Only return non demoted conversations" into rvc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2020-04-23 17:16:58 +00:00
committed by Android (Google) Code Review
parent 0d6b010e93 b1b9d64b5a
commit 07bed80a86
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/notification/PreferencesHelper.java
View File

@@ -1255,6 +1255,7 @@ public class PreferencesHelper implements RankingConfig {
for (int i = 0; i < N; i++) {
final NotificationChannel nc = p.channels.valueAt(i);
if (!TextUtils.isEmpty(nc.getConversationId()) && !nc.isDeleted()
&& !nc.isDemoted()
&& (nc.isImportantConversation() || !onlyImportant)) {
ConversationChannelWrapper conversation = new ConversationChannelWrapper();
conversation.setPkg(p.pkg);

38
services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
View File

@@ -3141,6 +3141,44 @@ public class PreferencesHelperTest extends UiServiceTestCase {
assertTrue(conversationWrapperContainsChannel(convos, channel2));
}
@Test
public void testGetConversations_notDemoted() {
String convoId = "convo";
NotificationChannel messages =
new NotificationChannel("messages", "Messages", IMPORTANCE_DEFAULT);
mHelper.createNotificationChannel(PKG_O, UID_O, messages, true, false);
NotificationChannel calls =
new NotificationChannel("calls", "Calls", IMPORTANCE_DEFAULT);
mHelper.createNotificationChannel(PKG_O, UID_O, calls, true, false);
NotificationChannel p =
new NotificationChannel("p calls", "Calls", IMPORTANCE_DEFAULT);
mHelper.createNotificationChannel(PKG_P, UID_P, p, true, false);
NotificationChannel channel =
new NotificationChannel("A person msgs", "messages from A", IMPORTANCE_DEFAULT);
channel.setConversationId(messages.getId(), convoId);
mHelper.createNotificationChannel(PKG_O, UID_O, channel, true, false);
NotificationChannel diffConvo =
new NotificationChannel("B person msgs", "messages from B", IMPORTANCE_DEFAULT);
diffConvo.setConversationId(p.getId(), "different convo");
diffConvo.setDemoted(true);
mHelper.createNotificationChannel(PKG_P, UID_P, diffConvo, true, false);
NotificationChannel channel2 =
new NotificationChannel("A person calls", "calls from A", IMPORTANCE_DEFAULT);
channel2.setConversationId(calls.getId(), convoId);
channel2.setImportantConversation(true);
mHelper.createNotificationChannel(PKG_O, UID_O, channel2, true, false);
List<ConversationChannelWrapper> convos = mHelper.getConversations(false);
assertEquals(2, convos.size());
assertTrue(conversationWrapperContainsChannel(convos, channel));
assertFalse(conversationWrapperContainsChannel(convos, diffConvo));
assertTrue(conversationWrapperContainsChannel(convos, channel2));
}
@Test
public void testGetConversations_onlyImportant() {
String convoId = "convo";