Fix null pointer exception

Bug: 2718857 Change-Id: I4b04284fd5b3a4881297fe15555e9f1ca91d73cb
2010-05-26 17:16:47 -07:00
parent fa499e4620
commit 7baec0fe4e
1 changed files with 5 additions and 2 deletions
--- a/services/java/com/android/server/NetworkManagementService.java
+++ b/services/java/com/android/server/NetworkManagementService.java
@@ -504,8 +504,11 @@ class NetworkManagementService extends INetworkManagementService.Stub {
    }

    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 {