From 01077bbc231a9e54a7edd9fd0f8ecae79715ef03 Mon Sep 17 00:00:00 2001 From: Ricky Wai Date: Wed, 29 Sep 2021 14:48:22 +0000 Subject: [PATCH] Check BAL flags on AlarmManagerTest for BAL broadcast test As now BroadcastOptions has the BAL also, so we need to update the test. Test is broken due to ag/15878929, we implement BroadcastOptions changes in AlarmManagerService but didn't fix the test. Bug: 201401122 Test: atest AlarmManagerServiceTest Change-Id: Iefaee3c52592c58cdc9675fd053c9779e61646a0 --- .../server/alarm/AlarmManagerServiceTest.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/services/tests/mockingservicestests/src/com/android/server/alarm/AlarmManagerServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/alarm/AlarmManagerServiceTest.java index 942958c595144..61cd4448cc353 100644 --- a/services/tests/mockingservicestests/src/com/android/server/alarm/AlarmManagerServiceTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/alarm/AlarmManagerServiceTest.java @@ -2898,14 +2898,10 @@ public class AlarmManagerServiceTest { if (idleOptions != null) { assertEquals(idleOptions, bundleCaptor.getValue()); } else { - if (isActivity) { - assertFalse("BAL flag needs to be false in alarm manager", - bundleCaptor.getValue().getBoolean( - ActivityOptions.KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED, - true)); - } else { - assertNull(bundleCaptor.getValue()); - } + assertFalse("BAL flag needs to be false in alarm manager", + bundleCaptor.getValue().getBoolean( + ActivityOptions.KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED, + true)); } }