[tor-commits] [orbot/master] re-add accidentally removed manifest entries!

[n8fr8 at torproject.org]

commit 5bd55f915218f2993ee1cf1aeab4ccbe8972caac
Author: Nathan Freitas <nathan at freitas.net>
Date:   Thu Mar 19 09:56:15 2015 -0400

    re-add accidentally removed manifest entries!
---
 AndroidManifest.xml |   26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 084fb65..398446e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -94,6 +94,32 @@
       	<activity android:name=".settings.SettingsPreferences"  android:label="@string/app_name"/>
         <activity android:name=".settings.AppManager"  android:label="@string/app_name"/>       
       
+        <service android:enabled="true"
+   			android:name=".service.TorService" 
+				android:permission="org.torproject.android.MANAGE_TOR"
+				android:stopWithTask="false"
+   		>
+	            <intent-filter>
+	                <action android:name="org.torproject.android.service.ITorService" />
+	              	<action android:name="org.torproject.android.service.TOR_SERVICE" />
+           </intent-filter>
+   	</service>
+   	
+   	<receiver android:name="org.torproject.android.service.OnBootReceiver">
+			<intent-filter>
+				<action	android:name="android.intent.action.BOOT_COMPLETED" />
+				<action android:name="android.intent.action.QUICKBOOT_POWERON" />
+				<action android:name="android.intent.action.MEDIA_MOUNTED"/>
+			</intent-filter>
+		</receiver>
+		
+   	
+       <service android:name="org.torproject.android.vpn.OrbotVpnService"
+               android:permission="android.permission.BIND_VPN_SERVICE">
+           <intent-filter>
+               <action android:name="android.net.VpnService"/>
+           </intent-filter>
+       </service>
         
 </application>
 </manifest>