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

Commit 9414f24c authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

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: I6569257d66e7e2e37f80f3c6b9a2ece23d5f4b8f
parent 689e05fa

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

+10 −0
Original line number Diff line number Diff line
@@ -330,6 +330,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