commit b3f3caef38326be2b4aea309237f718e6e2d2b8a
author Irfan Sheriff <isheriff@google.com> Wed May 26 21:32:29 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 26 21:32:29 2010 -0700
tree cab2d32ba9b2899001f5bbf6db994d2cfb5795f1
parent 4273ce19bf898ee41f2342209af6fe8ef4fb128e
parent 7baec0fe4ef66ac308ebc132d6c08865db653b30

Merge "Fix null pointer exception" into froyo

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

diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java
index 5e0439c..cbbc7be 100644
--- a/services/java/com/android/server/NetworkManagementService.java
+++ b/services/java/com/android/server/NetworkManagementService.java
@@ -504,8 +504,11 @@
     }
 
     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 {