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

Commit aeade6dc authored by kayiz's avatar kayiz Committed by Gerrit - the friendly Code Review server
Browse files

Network: Check parameter for NULL in isMmsRequest method 

It's the NullPointerException which causes the third part
application can't work normally. It happens when the third
part application calls execute in AndroidHttpClient.java.
The parameter may null when calling checkMmsSendPermission.

Add extra judgement to avoid NullPointerException for fixing
this issue.

CRs-Fixed: 584775

Change-Id: I1db5160952f1effeff7c35b10ae26656dfe476d8
parent 70302163

core/java/android/net/http/AndroidHttpClient.java

+8 −7
Original line number Diff line number Diff line
@@ -254,14 +254,15 @@ public final class AndroidHttpClient implements HttpClient { 


    private boolean isMmsRequest()

    {

        if(delegate.getParams() == null ||

                delegate.getParams().getParameter(CoreProtocolPNames.USER_AGENT) == null) {

            return false;

        }



        if(delegate.getParams().getParameter(CoreProtocolPNames.USER_AGENT).toString().contains("Android-Mms"))

        if (delegate != null) {

            HttpParams httpParams = delegate.getParams();

            if (httpParams != null) {

                Object parameter = httpParams.getParameter(CoreProtocolPNames.USER_AGENT);

                if (parameter != null && parameter.toString().contains("Android-Mms")) {

                    return true;



                }

            }

        }

        return false;

    }