Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '8316e875baee53b661d5af8fa843d97e51acbcf6' into kraken

* commit '8316e875baee53b661d5af8fa843d97e51acbcf6':
  Fix null pointer exception
This commit is contained in:
Irfan Sheriff
2010-05-26 21:37:45 -07:00
committed by Android Git Automerger
parent 7ca7eedbae 8316e875ba
commit 2ed4037901
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/NetworkManagementService.java
View File

@@ -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 {