From ac7733cd70c634504310e0fc3c0d10414130a3b3 Mon Sep 17 00:00:00 2001 From: Beverly Date: Mon, 1 Oct 2018 11:40:06 -0400 Subject: [PATCH] Add test for null-pointer in ZenModeHelperTest Change-Id: I540c86945a4a5a4538b01dff310a98be2944db76 Fixes: 116520986 Test: atest frameworks/base/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java --- .../android/server/notification/ZenModeHelperTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java index 702161e48b750..13f3e5e7a3add 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java @@ -1030,6 +1030,14 @@ public class ZenModeHelperTest extends UiServiceTestCase { assertEquals(1, mZenModeHelperSpy.mConditions.mSubscriptions.size()); } + @Test + public void testEmptyDefaultRulesMap() { + ZenModeConfig config = new ZenModeConfig(); + config.automaticRules = new ArrayMap<>(); + mZenModeHelperSpy.mConfig = config; + mZenModeHelperSpy.updateDefaultZenRules(); // shouldn't throw null pointer + } + private void setupZenConfig() { mZenModeHelperSpy.mZenMode = Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; mZenModeHelperSpy.mConfig.allowAlarms = false;