Merge "Fix null pointer exception" into froyo

Author: isheriff

services/java/com/android/server/NetworkManagementService.java

@@ -504,8 +504,11 @@ public void startAccessPoint(WifiConfiguration wifiConfig, String wlanIface, Str
     }
 
     private String convertQuotedString(String s) {
-      /* Replace \ with \\, then " with \" and add quotes at end */
-      return '"' + s.replaceAll("\\\\","\\\\\\\\").replaceAll("\"","\\\\\"") + '"';
+        if (s == null) {
+            return s;
+        }
+        /* Replace \ with \\, then " with \" and add quotes at end */
+        return '"' + s.replaceAll("\\\\","\\\\\\\\").replaceAll("\"","\\\\\"") + '"';
     }
 
     public void stopAccessPoint() throws IllegalStateException {