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

Commit ec1be308 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

DO NOT MERGE - Abort ProxyController if we get an error on start. 

Single SIM radio gives error on start and this leads to problems.  Small change
to short circuit and release wakelock.

bug:20559020
Change-Id: Ia113915f3be81ebd2b9635c5759fd3d33dec4270
parent 9be82816

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

+10 −0
Original line number Diff line number Diff line
@@ -331,6 +331,16 @@ public class ProxyController { 
     */

    private void onStartRadioCapabilityResponse(Message msg) {

        synchronized (mSetRadioAccessFamilyStatus) {

            AsyncResult ar = (AsyncResult)msg.obj;

            if (ar.exception != null) {

                // just abort now.  They didn't take our start so we don't have to revert

                logd("onStartRadioCapabilityResponse got exception=" + ar.exception);

                mRadioCapabilitySessionId = mUniqueIdGenerator.getAndIncrement();

                Intent intent = new Intent(TelephonyIntents.ACTION_SET_RADIO_CAPABILITY_FAILED);

                mContext.sendBroadcast(intent);

                clearTransaction();

                return;

            }

            RadioCapability rc = (RadioCapability) ((AsyncResult) msg.obj).result;

            if ((rc == null) || (rc.getSession() != mRadioCapabilitySessionId)) {

                logd("onStartRadioCapabilityResponse: Ignore session=" + mRadioCapabilitySessionId