diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-05-26 21:37:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-26 21:37:45 -0700 |
| commit | 2ed403790177dc3cd0295cc454f5bfa491cf98f5 (patch) | |
| tree | 8a2af38b9eb8361d69e115b05090ec86f4d9074a | |
| parent | 7ca7eedbaea33026ac6c6eaae5f7f27667380329 (diff) | |
| parent | 8316e875baee53b661d5af8fa843d97e51acbcf6 (diff) | |
| download | frameworks_base-2ed403790177dc3cd0295cc454f5bfa491cf98f5.zip frameworks_base-2ed403790177dc3cd0295cc454f5bfa491cf98f5.tar.gz frameworks_base-2ed403790177dc3cd0295cc454f5bfa491cf98f5.tar.bz2 | |
am 8316e875: am b3f3caef: Merge "Fix null pointer exception" into froyo
Merge commit '8316e875baee53b661d5af8fa843d97e51acbcf6' into kraken
* commit '8316e875baee53b661d5af8fa843d97e51acbcf6':
Fix null pointer exception
| -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 { |