Has both just like the new Pros. They didn't specifically confirm you can charge on USB-C, but my guess would be you can.