}
    RadioAttributes[] mRadioAttributes;

<<<<<<< HEAD
    public ConnectivityService(
            Context context, INetworkManagementService netd, INetworkPolicyManager policyManager) {
=======
    // the set of network types that can only be enabled by system/sig apps
    List mProtectedNetworks;

    public static synchronized ConnectivityService getInstance(Context context) {
        if (sServiceInstance == null) {
            sServiceInstance = new ConnectivityService(context);
        }
        return sServiceInstance;
    }

    private ConnectivityService(Context context) {
>>>>>>> 0e0a7597343b4f030be17788006006c93c85759c
        if (DBG) log("ConnectivityService starting up");

        HandlerThread handlerThread = new HandlerThread("ConnectivityServiceThread");

    }
    RadioAttributes[] mRadioAttributes;

    // the set of network types that can only be enabled by system/sig apps
    List mProtectedNetworks;

    public ConnectivityService(
            Context context, INetworkManagementService netd, INetworkPolicyManager policyManager) {
        if (DBG) log("ConnectivityService starting up");

        HandlerThread handlerThread = new HandlerThread("ConnectivityServiceThread");