Merge branch 'master' of git@github.com:phonegap/phonegap-android

framework/src/com/phonegap/GeoListener.java

@@ -66,8 +66,10 @@ public class GeoListener {
 	// This stops the listener
 	void stop()
 	{
-		mGps.stop();
-		mNetwork.stop();
+		if(mGps != null)
+			mGps.stop();
+		if(mNetwork != null)
+			mNetwork.stop();
 	}
 
 	public Location getCurrentLocation() {

framework/src/com/phonegap/StandAlone.java

@@ -11,22 +11,7 @@ public class StandAlone extends DroidGap {
 	public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         
-        /* Load a URI from the strings.xml file */
-        Class<R.string> c = R.string.class;
-        Field f;
-        String uri;
-        
-        int i = 0;
-        
-        try {
-          f = c.getField("url");
-          i = f.getInt(f);
-          uri = this.getResources().getString(i);
-        } catch (Exception e)
-        {
-          uri = "http://www.phonegap.com";
-        }
-        super.loadUrl(uri);                        
+        super.loadUrl("file:///android_asset/www/index.html");                        
     }		
 	
 }