o ICS related fixes.

Author: chris

lispmonApptuntap/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>LISP Monitor</name>
+	<name>LISP Monitor TUNTAP</name>
 	<comment></comment>
 	<projects>
 	</projects>

lispmonApptuntap/.settings/org.eclipse.jdt.core.prefs

@@ -1,5 +1,12 @@
-#Fri Mar 11 14:51:07 PST 2011
+#Mon Jul 16 10:10:29 PDT 2012
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6

lispmonApptuntap/AndroidManifest.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.le.lispmon"
-      android:versionCode="1"
-      android:versionName="1.0">
+      package="com.le.lispmontun" android:versionCode="2" android:versionName="2.0">
     <uses-sdk android:minSdkVersion="8" />
     <uses-feature android:name="android.hardware.location.gps" android:required="true"></uses-feature>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>

lispmonApptuntap/res/layout/main.xml

@@ -152,7 +152,7 @@
 			    android:background="@drawable/generic_button"
 				android:layout_width="140dip"
 				android:layout_height="wrap_content"
-				android:layout_marginRight="4dip">
+				android:layout_marginRight="4dip" android:enabled="false" android:visibility="gone">
 				</Button>
 
             <Button

lispmonApptuntap/src/com/le/lispmontun/lispMonitor.java

@@ -179,8 +179,8 @@ public void onProviderDisabled(String provider) {}
           };
 
         // Register the listener with the Location Manager to receive location updates
-        locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0, locationListener);
-        locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, locationListener);
+    //    locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0, locationListener);
+    //    locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, locationListener);
 
         // Set up the communication path to lispd. This will be extended to take over
         // from lispconf eventually.
@@ -249,9 +249,7 @@ static public String runTask(String command, String args, boolean ignoreOutput)
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		} 
-    	if (process != null) {
-    		process.destroy();
-    	}
+    	
     	return(output.toString());
     }
 
@@ -291,7 +289,7 @@ public void updateStatus() {
 
     	String psOutput = runTask("/system/bin/ps", "", false);
 
-    	lispdRunning = psOutput.contains("R /system/bin/lispd") || psOutput.contains("S lispd"); // No zombies only running or sleeping.
+    	lispdRunning = psOutput.contains("R /system/bin/lispd") || psOutput.contains("S /system/bin/lispd"); // No zombies only running or sleeping.
 
     	if (lispdRunning) {
     		lispCheckBoxLabel.setText(R.string.lispRunning);
@@ -379,6 +377,7 @@ public void onClick(View V) {
 			showMessage("Stop the LISP service?",
 					true, new Runnable() { public void run() {
 						killLispd();
+						lispdWasRunning = false;
 					}
 			});
 		}

lispmonApptuntap/src/com/le/lispmontun/updateConfActivity.java

@@ -16,7 +16,6 @@
 import android.app.AlertDialog;
 import android.os.Bundle;
 import android.os.Environment;
-import android.util.Log;
 import android.view.View;
 import android.content.DialogInterface;
 import android.widget.CheckBox;