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

Merge "Null check! Now with a test"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-22 15:20:31 +00:00
committed by Android (Google) Code Review
parent f03b32a22e 8e0eb372c9
commit 2c98e18ce5
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -684,11 +684,11 @@ public class RankingHelper implements RankingConfig {
NotificationChannel channel = r.channels.get(channelId);
if (channel != null) {
channel.setDeleted(true);
LogMaker lm = getChannelLog(channel, pkg);
lm.setType(MetricsProto.MetricsEvent.TYPE_CLOSE);
MetricsLogger.action(lm);
updateConfig();
}
LogMaker lm = getChannelLog(channel, pkg);
lm.setType(MetricsProto.MetricsEvent.TYPE_CLOSE);
MetricsLogger.action(lm);
updateConfig();
}
@Override

5
services/tests/notification/src/com/android/server/notification/RankingHelperTest.java
View File

@@ -726,6 +726,11 @@ public class RankingHelperTest {
assertEquals(channel.canShowBadge(), savedChannel.canShowBadge());
}
@Test
public void testDeleteNonExistentChannel() throws Exception {
mHelper.deleteNotificationChannelGroup(PKG, UID, "does not exist");
}
@Test
public void testGetDeletedChannel() throws Exception {
NotificationChannel channel =