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

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

Merge "return void when called getImei in case of RadioModemProxy is empty."... 

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

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



Change-Id: Idd93daf86b14b753fe9d3e5a6c0cdd81079f8865
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents debc0d31 81972c71

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

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

    public void getImei(Message result) {

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

        if (!modemProxy.isEmpty() &&

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

        if (modemProxy.isEmpty()) {

            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,

                    mRILDefaultWorkSource);