Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8316e875 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android Git Automerger
Browse files

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

Merge commit 'b3f3caef' into froyo-plus-aosp

* commit 'b3f3caef':
  Fix null pointer exception
parents f69fd4dd b3f3caef

services/java/com/android/server/NetworkManagementService.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -504,6 +504,9 @@ class NetworkManagementService extends INetworkManagementService.Stub { 
    }

    }





    private String convertQuotedString(String s) {

    private String convertQuotedString(String s) {

        if (s == null) {

            return s;

        }

        /* Replace \ with \\, then " with \" and add quotes at end */

        /* Replace \ with \\, then " with \" and add quotes at end */

        return '"' + s.replaceAll("\\\\","\\\\\\\\").replaceAll("\"","\\\\\"") + '"';

        return '"' + s.replaceAll("\\\\","\\\\\\\\").replaceAll("\"","\\\\\"") + '"';

    }

    }