am b3f3caef: Merge "Fix null pointer exception" into froyo

Merge commit 'b3f3caef38326be2b4aea309237f718e6e2d2b8a' into froyo-plus-aosp

* commit 'b3f3caef38326be2b4aea309237f718e6e2d2b8a':
  Fix null pointer exception

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

@@ -504,6 +504,9 @@ class NetworkManagementService extends INetworkManagementService.Stub {
     }
 
     private String convertQuotedString(String s) {
+        if (s == null) {
+            return s;
+        }
         /* Replace \ with \\, then " with \" and add quotes at end */
         return '"' + s.replaceAll("\\\\","\\\\\\\\").replaceAll("\"","\\\\\"") + '"';
     }