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

Commit 3646da88 authored by Yan Yan's avatar Yan Yan
Browse files

Clean up FLAG_ENFORCE_MAIN_USER 

Bug: 310310661
Test: atest FrameworksVcnTests && atest CtsVcnTestCases
Flag: EXEMPT flag cleanup
Change-Id: I461c4167397608fffbf366c90e4d3bb42e2564f5
parent 1a76725a

core/java/android/net/vcn/flags.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -36,13 +36,3 @@ flag{ 
    description: "Re-evaluate IPsec packet loss on LinkProperties or NetworkCapabilities change"

    bug: "323238888"

}
 
 No newline at end of file
 


flag{

    name: "enforce_main_user"

    namespace: "vcn"

    description: "Enforce main user to make VCN HSUM compatible"

    bug: "310310661"

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}
 
 No newline at end of file

services/core/java/com/android/server/VcnManagementService.java

+9 −16
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ import android.net.LinkProperties; 
import android.net.Network;

import android.net.NetworkCapabilities;

import android.net.NetworkRequest;

import android.net.vcn.Flags;

import android.net.vcn.IVcnManagementService;

import android.net.vcn.IVcnStatusCallback;

import android.net.vcn.IVcnUnderlyingNetworkPolicyListener;
@@ -447,8 +446,6 @@ public class VcnManagementService extends IVcnManagementService.Stub { 
        }



        final UserHandle userHandle = UserHandle.getUserHandleForUid(uid);



        if (Flags.enforceMainUser()) {

        final UserManager userManager = mContext.getSystemService(UserManager.class);



        Binder.withCleanCallingIdentity(
@@ -459,10 +456,6 @@ public class VcnManagementService extends IVcnManagementService.Stub { 
                                        + " the main user");

                    }

                });

        } else if (!userHandle.isSystem()) {

            throw new SecurityException(

                    "VcnManagementService can only be used by callers running as the primary user");

        }

    }



    private void enforceCallingUserAndCarrierPrivilege(

tests/vcn/java/com/android/server/VcnManagementServiceTest.java

+0 −7
Original line number Diff line number Diff line
@@ -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(