[or-cvs] r23155: {projects} removed debuggable settings in AndroidManifest and waitforde (in projects/android/trunk/Orbot: . src/org/torproject/android/service)

Nathan Freitas nathan at freitas.net
Thu Sep 9 20:42:14 UTC 2010


Author: n8fr8
Date: 2010-09-09 20:42:14 +0000 (Thu, 09 Sep 2010)
New Revision: 23155

Modified:
   projects/android/trunk/Orbot/AndroidManifest.xml
   projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java
Log:
removed debuggable settings in AndroidManifest and waitfordebugger calls in service code

Modified: projects/android/trunk/Orbot/AndroidManifest.xml
===================================================================
--- projects/android/trunk/Orbot/AndroidManifest.xml	2010-09-09 20:39:52 UTC (rev 23154)
+++ projects/android/trunk/Orbot/AndroidManifest.xml	2010-09-09 20:42:14 UTC (rev 23155)
@@ -5,7 +5,7 @@
        <uses-permission android:name="android.permission.INTERNET" />
 
  
-    <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true">
+    <application android:icon="@drawable/icon" android:label="@string/app_name">
       
         <activity android:name=".Orbot"
                   android:theme="@android:style/Theme.NoTitleBar">
@@ -33,8 +33,7 @@
         <activity android:name=".AppManager"  android:label="@string/app_name"/>
         <activity android:name=".WizardActivity"  android:label="@string/app_name"/>
       
-    	<!-- <service android:name=".service.TorService" android:process=":remote"> -->
-    	<service android:name=".service.TorService">
+    	<service android:name=".service.TorService" android:process=":remote">
 	            <intent-filter>
 	                <action android:name="org.torproject.android.service.ITorService" />
 	              	<action android:name="org.torproject.android.service.TOR_SERVICE" />

Modified: projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java
===================================================================
--- projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java	2010-09-09 20:39:52 UTC (rev 23154)
+++ projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java	2010-09-09 20:42:14 UTC (rev 23155)
@@ -213,7 +213,7 @@
 	public static int setTransparentProxyingByApp(Context context, TorifiedApp[] apps, boolean forceAll) throws Exception
 	{
 
-		android.os.Debug.waitForDebugger();
+		//android.os.Debug.waitForDebugger();
 		
 		String baseDir = findBaseDir();
 



More information about the tor-commits mailing list