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

Commit 81972c71 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "return void when called getImei in case of RadioModemProxy is empty." into udc-dev

parents fbf18654 46dc47d2

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

+7 −2
Original line number Original line Diff line number Diff line
@@ -3756,8 +3756,13 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    @Override

    @Override

    public void getImei(Message result) {

    public void getImei(Message result) {

        RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class, result);

        RadioModemProxy modemProxy = getRadioServiceProxy(RadioModemProxy.class, result);

        if (!modemProxy.isEmpty() &&

        if (modemProxy.isEmpty()) {

                mHalVersion.get(HAL_SERVICE_MODEM).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {

            if (RILJ_LOGD) {

                Rlog.e(RILJ_LOG_TAG, "getImei: modemProxy is Empty");

            }

            return;

        }

        if (mHalVersion.get(HAL_SERVICE_MODEM).greaterOrEqual(RADIO_HAL_VERSION_2_1)) {

            RILRequest rr = obtainRequest(RIL_REQUEST_DEVICE_IMEI, result,

            RILRequest rr = obtainRequest(RIL_REQUEST_DEVICE_IMEI, result,

                    mRILDefaultWorkSource);

                    mRILDefaultWorkSource);