Merge "Disable the AppOp Restriction for IpSec Tunnels" into stage-aosp-master

        }

    }

    private static final String TUNNEL_OP = "STOPSHIP"; // = AppOpsManager.OP_MANAGE_IPSEC_TUNNELS;

    private void enforceTunnelPermissions(String callingPackage) {

        checkNotNull(callingPackage, "Null calling package cannot create IpSec tunnels");

        if (false) { // STOPSHIP if this line is present

            switch (getAppOpsManager().noteOp(

                    AppOpsManager.OP_MANAGE_IPSEC_TUNNELS,

                        TUNNEL_OP,

                        Binder.getCallingUid(), callingPackage)) {

                case AppOpsManager.MODE_DEFAULT:

                    mContext.enforceCallingOrSelfPermission(

                    throw new SecurityException("Request to ignore AppOps for non-legacy API");

            }

        }

    }

    private void createOrUpdateTransform(

            IpSecConfig c, int resourceId, SpiRecord spiRecord, EncapSocketRecord socketRecord)

import java.util.Collection;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runners.Parameterized;

        }

    }

    @Ignore

    @Test

    public void testAddTunnelFailsForBadPackageName() throws Exception {

        try {