diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-10-08 20:59:30 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-10-08 20:59:30 +0200 |
| commit | 2b56dd61c0bd9eb6f71405d1d7f07f3051b29601 (patch) | |
| tree | 7f4f30989d99f743467b3c382ff4858f45d1eead /app/src/main/AndroidManifest.xml | |
| parent | 34643c6b5ab0643383e24025876b0d69859ba4f9 (diff) | |
| parent | 35674aa6be80c153a0fbe4a4c15c54e02aef0b3e (diff) | |
Merge branch 'feature/Early-routes-#5816' into develop
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 423293b6..68a99560 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -36,6 +36,14 @@ android:label="@string/app" > <service + android:name="se.leap.bitmaskclient.VoidVpnService" + android:permission="android.permission.BIND_VPN_SERVICE"> + <intent-filter> + <action android:name="android.net.VpnService" /> + </intent-filter> + </service> + + <service android:name="de.blinkt.openvpn.core.OpenVPNService" android:permission="android.permission.BIND_VPN_SERVICE"> <intent-filter> @@ -53,6 +61,8 @@ </intent-filter> </receiver> + <activity + android:name="se.leap.bitmaskclient.VoidVpnLauncher" /> <activity android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" android:name="de.blinkt.openvpn.activities.DisconnectVPN" /> |