drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit 'b3f3caef38326be2b4aea309237f718e6e2d2b8a' into froyo-plus-aosp

* commit 'b3f3caef38326be2b4aea309237f718e6e2d2b8a':
  Fix null pointer exception
This commit is contained in:
Irfan Sheriff
2010-05-26 21:34:52 -07:00
committed by Android Git Automerger
parent f69fd4dd48 b3f3caef38
commit 8316e875ba
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) { private String convertQuotedString(String s) {
/* Replace \ with \\, then " with \" and add quotes at end */ if (s == null) {
return '"' + s.replaceAll("\\\\","\\\\\\\\").replaceAll("\"","\\\\\"") + '"'; return s;
}
/* Replace \ with \\, then " with \" and add quotes at end */
return '"' + s.replaceAll("\\\\","\\\\\\\\").replaceAll("\"","\\\\\"") + '"';
} }
public void stopAccessPoint() throws IllegalStateException { public void stopAccessPoint() throws IllegalStateException {