From 2157886ed5b7af2221a175a1eeee6585aab68355 Mon Sep 17 00:00:00 2001 From: Matías Hernández Date: Wed, 13 Dec 2023 15:53:08 +0100 Subject: Temporarily disable NotificationManagerServiceTest from CF_AUTO Bug: 315780402 Test: atest NotificationManagerServiceTest Change-Id: I9438e980f0ca1b58134e3a068423a30a751560a3 --- services/tests/uiservicestests/Android.bp | 1 + .../server/notification/NotificationManagerServiceTest.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/services/tests/uiservicestests/Android.bp b/services/tests/uiservicestests/Android.bp index 6335b3bfade2..4e1c72af2727 100644 --- a/services/tests/uiservicestests/Android.bp +++ b/services/tests/uiservicestests/Android.bp @@ -46,6 +46,7 @@ android_test { "testng", "flag-junit", "notification_flags_lib", + "platform-test-rules", ], libs: [ diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java index 9de0e67823d3..3f437c89127e 100755 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -211,6 +211,9 @@ import android.os.WorkSource; import android.permission.PermissionManager; import android.platform.test.annotations.EnableFlags; import android.platform.test.flag.junit.SetFlagsRule; +import android.platform.test.rule.DeniedDevices; +import android.platform.test.rule.DeviceProduct; +import android.platform.test.rule.LimitDevicesRule; import android.provider.DeviceConfig; import android.provider.MediaStore; import android.provider.Settings; @@ -281,6 +284,7 @@ import libcore.junit.util.compat.CoreCompatChangeRule.EnableCompatChanges; import org.junit.After; import org.junit.Assert; import org.junit.Before; +import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; @@ -313,6 +317,7 @@ import java.util.function.Consumer; @RunWith(AndroidTestingRunner.class) @SuppressLint("GuardedBy") // It's ok for this test to access guarded methods from the service. @RunWithLooper +@DeniedDevices(denied = {DeviceProduct.CF_AUTO}) public class NotificationManagerServiceTest extends UiServiceTestCase { private static final String TEST_CHANNEL_ID = "NotificationManagerServiceTestChannelId"; private static final String TEST_PACKAGE = "The.name.is.Package.Test.Package"; @@ -331,6 +336,9 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { private final int mUid = Binder.getCallingUid(); private final @UserIdInt int mUserId = UserHandle.getUserId(mUid); + @ClassRule + public static final LimitDevicesRule sLimitDevicesRule = new LimitDevicesRule(); + @Rule public TestRule compatChangeRule = new PlatformCompatChangeRule(); -- cgit v1.2.3-59-g8ed1b