Remove un-needed "-netspeed full" and "-netdelay none".

This patch removes the use of "-netspeed full" and "-netdelay none"
when starting a core, since these values correspond to the default.

Usually, these were triggered by the values found in the skin files.

Change-Id: I88944c6736dc721a8645b1c7d87bc0cb949feec4

1 files changed, 11 insertions, 9 deletions

diff --git a/android/main.c b/android/main.c
index 03cc2a8..d906f8d 100644
--- a/android/main.c
+++ b/android/main.c
@@ -299,15 +299,17 @@ int main(int argc, char **argv)
     parse_skin_files(opts->skindir, opts->skin, opts, hw,
                      &skinConfig, &skinPath);
 
-    if (!opts->netspeed) {
-        if (skin_network_speed)
-            D("skin network speed: '%s'", skin_network_speed);
-        opts->netspeed = (char*)skin_network_speed;
-    }
-    if (!opts->netdelay) {
-        if (skin_network_delay)
-            D("skin network delay: '%s'", skin_network_delay);
-        opts->netdelay = (char*)skin_network_delay;
+    if (!opts->netspeed && skin_network_speed) {
+        D("skin network speed: '%s'", skin_network_speed);
+        if (strcmp(skin_network_speed, NETWORK_SPEED_DEFAULT) != 0) {
+            opts->netspeed = (char*)skin_network_speed;
+        }
+    }
+    if (!opts->netdelay && skin_network_delay) {
+        D("skin network delay: '%s'", skin_network_delay);
+        if (strcmp(skin_network_delay, NETWORK_DELAY_DEFAULT) != 0) {
+            opts->netdelay = (char*)skin_network_delay;
+        }
     }
 
     if (opts->trace) {