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

Commit c9c76341 authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Increment radio proxy cookie when service is dead. 

This is to avoid trying to get service constantly and have
delays between attempts as intended.

Test: Basic telephony sanity
Bug: 36599399
Change-Id: I6926c67ba9ae84f9841ef7b0b88d5e340201dc20
parent 4f6584f6

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

+18 −7
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.internal.telephony;



import static com.android.internal.telephony.RILConstants.*;

import static com.android.internal.util.Preconditions.checkNotNull;



import android.content.Context;

import android.hardware.radio.V1_0.Carrier;

import android.hardware.radio.V1_0.CarrierRestrictions;
@@ -88,7 +91,6 @@ import java.io.ByteArrayInputStream; 
import java.io.DataInputStream;

import java.io.FileDescriptor;

import java.io.IOException;

import java.io.InputStream;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Arrays;
@@ -98,9 +100,6 @@ import java.util.concurrent.atomic.AtomicBoolean; 
import java.util.concurrent.atomic.AtomicInteger;

import java.util.concurrent.atomic.AtomicLong;



import static com.android.internal.telephony.RILConstants.*;

import static com.android.internal.util.Preconditions.checkNotNull;



/**

 * {@hide}

 */
@@ -478,6 +477,9 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
        mRadioProxy = null;

        mOemHookProxy = null;



        // increment the cookie so that death notification can be ignored

        mRadioProxyCookie.incrementAndGet();



        setRadioState(RadioState.RADIO_UNAVAILABLE);



        RILRequest.resetSerial();
@@ -522,7 +524,8 @@ public final class RIL extends BaseCommands implements CommandsInterface { 


            // 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.get()),

                    mRilHandler.obtainMessage(EVENT_RADIO_PROXY_DEAD,

                            mRadioProxyCookie.incrementAndGet()),

                    IRADIO_GET_SERVICE_DELAY_MILLIS);

        }
@@ -563,7 +566,8 @@ public final class RIL extends BaseCommands implements CommandsInterface { 


            // 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.get()),

                    mRilHandler.obtainMessage(EVENT_RADIO_PROXY_DEAD,

                            mRadioProxyCookie.incrementAndGet()),

                    IRADIO_GET_SERVICE_DELAY_MILLIS);

        }
@@ -652,6 +656,13 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
    private void handleRadioProxyExceptionForRR(RILRequest rr, String caller, Exception e) {

        riljLoge(caller + ": " + e);

        resetProxyAndRequestList();



        // service most likely died, handle exception like death notification to try to get service

        // again

        mRilHandler.sendMessageDelayed(

                mRilHandler.obtainMessage(EVENT_RADIO_PROXY_DEAD,

                        mRadioProxyCookie.incrementAndGet()),

                IRADIO_GET_SERVICE_DELAY_MILLIS);

    }



    private String convertNullToEmptyString(String string) {
@@ -3861,7 +3872,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
            try {

                radioProxy.responseAcknowledgement();

            } catch (RemoteException | RuntimeException e) {

                resetProxyAndRequestList();

                handleRadioProxyExceptionForRR(rr, "sendAck", e);

                riljLoge("sendAck: " + e);

            }

        } else {