summaryrefslogtreecommitdiff
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2013-01-04 20:54:50 +0100
committerArne Schwabe <arne@rfc2549.org>2013-01-04 20:54:50 +0100
commit5350c37c79e7fc3561c0bda068565ef19630131a (patch)
tree412831be8a00d8651681a6bd1cf0c7b9f5196219 /AndroidManifest.xml
parentc767a06a53230ec3829a6ad76b1201a20fae76fa (diff)
Some more changes making external API possible
--HG-- extra : rebase_source : a62d022b917c997a5e116c34802fecfb1f066459
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml13
1 files changed, 11 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2bd0be0e..07fbde8a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -68,13 +68,22 @@
<action android:name="android.net.VpnService" />
</intent-filter>
</service>
- <service android:name=".api.ExternalOpenVPNService"
- android:permission="de.blinkt.openvpn.REMOTE_API">
+ <service
+ android:name=".api.ExternalOpenVPNService"
+ android:permission="de.blinkt.openvpn.REMOTE_API" >
<intent-filter>
<action android:name="de.blinkt.openvpn.api.IOpenVPNAPIService" />
</intent-filter>
</service>
+ <activity
+ android:name=".api.GrantPermissionsActivity"
+ android:permission="de.blinkt.openvpn.REMOTE_API" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ </intent-filter>
+ </activity>
+
<receiver android:name=".OnBootReceiver" >
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />