Bug 614173 - Android agent needs a more robust way to pull files pt 2, also make ini reading more bulletproof r=ctalbert, a=NPOTB

build/mobile/sutagent/android/DoCommand.java

@@ -123,7 +123,7 @@ public class DoCommand {
 	String	sErrorPrefix = "##AGENT-WARNING## ";
 	boolean bTraceOn = false;
 	
-	private final String prgVersion = "SUTAgentAndroid Version 0.93";
+	private final String prgVersion = "SUTAgentAndroid Version 0.94";
 	
 	public enum Command
 		{
@@ -2376,7 +2376,8 @@ public class DoCommand {
 						temp = sLine.split("=");
 						if (temp != null)
 							{
-							sRet = temp[1].trim();
+							if (temp.length > 1)
+								sRet = temp[1].trim();
 							}
 						break;
 						}

build/mobile/sutagent/android/SUTAgentAndroid.java

@@ -67,6 +67,7 @@ import android.net.wifi.WifiManager;
 import android.net.wifi.WifiManager.WifiLock;
 import android.os.BatteryManager;
 import android.os.Bundle;
+import android.os.Debug;
 import android.os.PowerManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
@@ -106,8 +107,6 @@ public class SUTAgentAndroid extends Activity
     
     private BroadcastReceiver battReceiver = null;
     
-    IWatcherService mService = null;
-
 	public boolean onCreateOptionsMenu(Menu menu)
 		{
 		mExitMenuItem = menu.add("Exit");
@@ -137,8 +136,6 @@ public class SUTAgentAndroid extends Activity
         
         setContentView(R.layout.main);
 
-//        Debug.waitForDebugger();
-
         // Keep phone from locking or remove lock on screen
         KeyguardManager km = (KeyguardManager)getSystemService(Context.KEYGUARD_SERVICE);
         if (km != null)
@@ -722,4 +719,4 @@ public class SUTAgentAndroid extends Activity
         }
     };
 */	
-}
+}