Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42144a84 authored by Fangqiu Su's avatar Fangqiu Su Committed by Android (Google) Code Review
Browse files

Merge "Update the imports to androidx.test.filters.*" into main

parents be181562 a390f5f0

services/tests/uiservicestests/src/com/android/server/notification/AlertRateLimiterTest.java

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ import static com.android.server.notification.AlertRateLimiter.ALLOWED_ALERT_INT 
import static junit.framework.Assert.assertFalse;

import static junit.framework.Assert.assertTrue;



import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.server.UiServiceTestCase;

services/tests/uiservicestests/src/com/android/server/notification/ArchiveTest.java

+1 −1
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.platform.test.flag.junit.SetFlagsRule;

import android.service.notification.StatusBarNotification;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.server.UiServiceTestCase;

services/tests/uiservicestests/src/com/android/server/notification/BadgeExtractorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ import android.graphics.drawable.Icon; 
import android.media.session.MediaSession;

import android.os.UserHandle;

import android.service.notification.StatusBarNotification;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.server.UiServiceTestCase;

services/tests/uiservicestests/src/com/android/server/notification/BubbleExtractorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ import android.content.pm.ShortcutInfo; 
import android.os.SystemClock;

import android.os.UserHandle;

import android.service.notification.StatusBarNotification;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.server.UiServiceTestCase;

services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java

+1 −1
Original line number Diff line number Diff line
@@ -74,12 +74,12 @@ import android.os.Vibrator; 
import android.provider.Settings;

import android.service.notification.NotificationListenerService;

import android.service.notification.StatusBarNotification;

import android.test.suitebuilder.annotation.SmallTest;

import android.view.accessibility.AccessibilityEvent;

import android.view.accessibility.AccessibilityManager;

import android.view.accessibility.IAccessibilityManager;

import android.view.accessibility.IAccessibilityManagerClient;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.internal.logging.InstanceIdSequence;