diff options
Diffstat (limited to 'services/java/com/android/server/NetworkManagementService.java')
| -rw-r--r-- | services/java/com/android/server/NetworkManagementService.java | 7 |
1 files changed, 5 insertions, 2 deletions
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 @@ 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 { |