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

Commit b669cc50 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix sporaddic error on RIL#clearRequestList" am: 9f721942 am: 9a2430c7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1538204

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c1476b3c802762798f30f7131b034b6e8a87d5e
parents 45c1422d 9a2430c7

src/java/com/android/internal/telephony/RILRequest.java

+8 −8
Original line number Diff line number Diff line
@@ -232,20 +232,20 @@ public class RILRequest { 
    }



    @UnsupportedAppUsage

    void onError(int error, Object ret) {

        CommandException ex;



        ex = CommandException.fromRilErrno(error);

    void onError(final int error, final Object ret) {

        final CommandException ex = CommandException.fromRilErrno(error);



        final Message result = mResult;

        if (RIL.RILJ_LOGD) {

            Rlog.d(LOG_TAG, serialString() + "< "

                    + RIL.requestToString(mRequest)

                    + " error: " + ex + " ret=" + RIL.retToString(mRequest, ret));

                    + " error: " + ex + " ret=" + RIL.retToString(mRequest, ret)

                    + " result=" + result);

        }



        if (mResult != null) {

            AsyncResult.forMessage(mResult, ret, ex);

            mResult.sendToTarget();

        if (result != null && result.getTarget() != null) {

            AsyncResult.forMessage(result, ret, ex);

            result.sendToTarget();

        }

    }

}