Fix null pointer exception

isheriff · isheriff · commit 7baec0fe4ef6 · 2010-05-26T17:16:47.000-07:00
Bug: 2718857
Change-Id: I4b04284fd5b3a4881297fe15555e9f1ca91d73cb
diff --git a/services/java/com/android/server/NetworkManagementService.java b/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 {

Original file line number	Diff line number	Diff line change
`@@ -504,8 +504,11 @@ public void startAccessPoint(WifiConfiguration wifiConfig, String wlanIface, Str`
`504`	`504`	`}`
`505`	`505`
`506`	`506`	`private String convertQuotedString(String s) {`
`507`		`- /* Replace \ with \\, then " with \" and add quotes at end */`
`508`		`- return '"' + s.replaceAll("\\\\","\\\\\\\\").replaceAll("\"","\\\\\"") + '"';`
	`507`	`+ if (s == null) {`
	`508`	`+ return s;`
	`509`	`+ }`
	`510`	`+ /* Replace \ with \\, then " with \" and add quotes at end */`
	`511`	`+ return '"' + s.replaceAll("\\\\","\\\\\\\\").replaceAll("\"","\\\\\"") + '"';`
`509`	`512`	`}`
`510`	`513`
`511`	`514`	`public void stopAccessPoint() throws IllegalStateException {`