Merge "Remove Notification.DevFlags" into sc-dev

This commit is contained in:
Jeff DeCew
2021-03-23 19:50:27 +00:00
committed by Android (Google) Code Review

View File

@@ -50,9 +50,7 @@ import com.android.connectivity.resources.R;
import com.android.server.connectivity.NetworkNotificationManager.NotificationType;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -104,17 +102,6 @@ public class NetworkNotificationManagerTest {
NetworkNotificationManager mManager;
@BeforeClass
public static void setUpClass() {
Notification.DevFlags.sForceDefaults = true;
}
@AfterClass
public static void tearDownClass() {
Notification.DevFlags.sForceDefaults = false;
}
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);