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

Merge "Fix NPE" into sc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2021-02-03 04:18:57 +00:00
committed by Android (Google) Code Review
parent 12442e7ab9 52742ec890
commit 5846da7a7b
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1419,8 +1419,10 @@ public class PreferencesHelper implements RankingConfig {
conversation.setPkg(p.pkg); conversation.setPkg(p.pkg);
conversation.setUid(p.uid); conversation.setUid(p.uid);
conversation.setNotificationChannel(nc); conversation.setNotificationChannel(nc);
conversation.setParentChannelLabel( NotificationChannel parent = p.channels.get(nc.getParentChannelId());
p.channels.get(nc.getParentChannelId()).getName()); conversation.setParentChannelLabel(parent == null
? null
: parent.getName());
boolean blockedByGroup = false; boolean blockedByGroup = false;
if (nc.getGroup() != null) { if (nc.getGroup() != null) {
NotificationChannelGroup group = p.groups.get(nc.getGroup()); NotificationChannelGroup group = p.groups.get(nc.getGroup());

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

@@ -3536,6 +3536,28 @@ public class PreferencesHelperTest extends UiServiceTestCase {
assertFalse(conversationWrapperContainsChannel(convos, channel2)); assertFalse(conversationWrapperContainsChannel(convos, channel2));
} }
@Test
public void testGetConversations_parentDeleted() {
String convoId = "convo";
NotificationChannel messages =
new NotificationChannel("messages", "Messages", IMPORTANCE_DEFAULT);
mHelper.createNotificationChannel(PKG_O, UID_O, messages, true, false);
NotificationChannel channel =
new NotificationChannel("A person msgs", "messages from A", IMPORTANCE_DEFAULT);
channel.setConversationId(messages.getId(), convoId);
channel.setImportantConversation(true);
mHelper.createNotificationChannel(PKG_O, UID_O, channel, true, false);
mHelper.permanentlyDeleteNotificationChannel(PKG_O, UID_O, "messages");
List<ConversationChannelWrapper> convos =
mHelper.getConversations(IntArray.wrap(new int[] {0}), true);
assertEquals(1, convos.size());
assertTrue(conversationWrapperContainsChannel(convos, channel));
}
private boolean conversationWrapperContainsChannel(List<ConversationChannelWrapper> list, private boolean conversationWrapperContainsChannel(List<ConversationChannelWrapper> list,
NotificationChannel expected) { NotificationChannel expected) {
for (ConversationChannelWrapper ccw : list) { for (ConversationChannelWrapper ccw : list) {