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

Commit 95155fab authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "OemHook missing but called: don't infinite loop" into pi-dev 

am: fd13d127

Change-Id: I62a296241e6b12ef806fa4b7bd7a92143242cd31
parents c8b90e2f fd13d127

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

+1 −7
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 


        try {

            mOemHookProxy = IOemHook.getService(

                    HIDL_SERVICE_NAME[mPhoneId == null ? 0 : mPhoneId]);

                    HIDL_SERVICE_NAME[mPhoneId == null ? 0 : mPhoneId], true);

            if (mOemHookProxy != null) {

                // not calling linkToDeath() as ril service runs in the same process and death

                // notification for that should be sufficient
@@ -435,12 +435,6 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                        CommandException.fromRilErrno(RADIO_NOT_AVAILABLE));

                result.sendToTarget();

            }



            // if service is not up, treat it like death notification to try to get service again

            mRilHandler.sendMessageDelayed(

                    mRilHandler.obtainMessage(EVENT_RADIO_PROXY_DEAD,

                            mRadioProxyCookie.incrementAndGet()),

                    IRADIO_GET_SERVICE_DELAY_MILLIS);

        }



        return mOemHookProxy;