diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-05-26 21:34:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-26 21:34:52 -0700 |
| commit | 8316e875baee53b661d5af8fa843d97e51acbcf6 (patch) | |
| tree | 042dbf082861b305faf8d68143cb404a47d8a6cc /services/java/com/android/server | |
| parent | f69fd4dd481c10749a8651ab6c9cfda1dea68297 (diff) | |
| parent | b3f3caef38326be2b4aea309237f718e6e2d2b8a (diff) | |
| download | frameworks_base-8316e875baee53b661d5af8fa843d97e51acbcf6.zip frameworks_base-8316e875baee53b661d5af8fa843d97e51acbcf6.tar.gz frameworks_base-8316e875baee53b661d5af8fa843d97e51acbcf6.tar.bz2 | |
am b3f3caef: Merge "Fix null pointer exception" into froyo
Merge commit 'b3f3caef38326be2b4aea309237f718e6e2d2b8a' into froyo-plus-aosp
* commit 'b3f3caef38326be2b4aea309237f718e6e2d2b8a':
Fix null pointer exception
Diffstat (limited to 'services/java/com/android/server')
| -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 { |