summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
author Yan Yan <evitayan@google.com> 2024-10-10 11:08:22 -0700
committer Yan Yan <evitayan@google.com> 2024-10-10 11:49:41 -0700
commit3646da8858b41be99136fccd65d078ea4e88bccc (patch)
treeb1739767f1aed1279ded622d49574f54bfecccf4 /tests
parent1a76725a487981379f68a6cc8612d4e78f8ebd54 (diff)
Clean up FLAG_ENFORCE_MAIN_USER
Bug: 310310661 Test: atest FrameworksVcnTests && atest CtsVcnTestCases Flag: EXEMPT flag cleanup Change-Id: I461c4167397608fffbf366c90e4d3bb42e2564f5
Diffstat (limited to 'tests')
-rw-r--r--tests/vcn/java/com/android/server/VcnManagementServiceTest.java7
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/vcn/java/com/android/server/VcnManagementServiceTest.java b/tests/vcn/java/com/android/server/VcnManagementServiceTest.java
index 4cb7c91b2451..7e0bbc4b3e50 100644
--- a/tests/vcn/java/com/android/server/VcnManagementServiceTest.java
+++ b/tests/vcn/java/com/android/server/VcnManagementServiceTest.java
@@ -70,7 +70,6 @@ import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.NetworkRequest;
import android.net.Uri;
-import android.net.vcn.Flags;
import android.net.vcn.IVcnStatusCallback;
import android.net.vcn.IVcnUnderlyingNetworkPolicyListener;
import android.net.vcn.VcnConfig;
@@ -85,7 +84,6 @@ import android.os.Process;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.test.TestLooper;
-import android.platform.test.flag.junit.SetFlagsRule;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
@@ -104,7 +102,6 @@ import com.android.server.vcn.util.PersistableBundleUtils;
import com.android.server.vcn.util.PersistableBundleUtils.PersistableBundleWrapper;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -122,8 +119,6 @@ import java.util.UUID;
@RunWith(AndroidJUnit4.class)
@SmallTest
public class VcnManagementServiceTest {
- @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
-
private static final String CONTEXT_ATTRIBUTION_TAG = "VCN";
private static final String TEST_PACKAGE_NAME =
VcnManagementServiceTest.class.getPackage().getName();
@@ -285,8 +280,6 @@ public class VcnManagementServiceTest {
@Before
public void setUp() {
- mSetFlagsRule.enableFlags(Flags.FLAG_ENFORCE_MAIN_USER);
-
doNothing()
.when(mMockContext)
.enforceCallingOrSelfPermission(