summaryrefslogtreecommitdiffhomepage
path: root/android/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-05-29 11:50:07 -0300
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-05-29 11:50:07 -0300
commit6188daf9e1d3446084dcb2e11efd42806c79e0ab (patch)
tree58c4784ca316b8263f1596c475b8cc7f23e7d516 /android/src/main/AndroidManifest.xml
parent0eb13af5be6a204f9c94783bd16498101bfbb97d (diff)
parentdcb94332ab4b9f881df1ba2fcf5d1ef449704fd4 (diff)
downloadmullvadvpn-6188daf9e1d3446084dcb2e11efd42806c79e0ab.tar.xz
mullvadvpn-6188daf9e1d3446084dcb2e11efd42806c79e0ab.zip
Merge branch 'vpn-service-tun-provider'
Diffstat (limited to 'android/src/main/AndroidManifest.xml')
-rw-r--r--android/src/main/AndroidManifest.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 450c316618..d025f278a5 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -22,5 +22,14 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
+
+ <service
+ android:name=".MullvadVpnService$InnerVpnService"
+ android:permission="android.permission.BIND_VPN_SERVICE"
+ >
+ <intent-filter>
+ <action android:name="android.net.VpnService" />
+ </intent-filter>
+ </service>
</application>
</manifest>