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

Commit 606cb716 authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Change radio related service names to slot1, slot2, slot3... 

Test: Basic telephony sanity
Bug: 36570718
Merged-in: I425a78717fdd30d837ea7d8459192574afc75969
Change-Id: I425a78717fdd30d837ea7d8459192574afc75969
parent 211f45b2

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

+3 −4
Original line number Diff line number Diff line
@@ -342,8 +342,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { 


    //***** Constants



    static final String[] RIL_SERVICE_NAME = {"rild", "rild2", "rild3"};

    static final String[] OEM_HOOK_SERVICE_NAME = {"oemhook", "oemhook2", "oemhook3"};

    static final String[] HIDL_SERVICE_NAME = {"slot1", "slot2", "slot3"};



    static final int IRADIO_GET_SERVICE_DELAY_MILLIS = 4 * 1000;
@@ -503,7 +502,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
        }



        try {

            mRadioProxy = IRadio.getService(RIL_SERVICE_NAME[mPhoneId == null ? 0 : mPhoneId]);

            mRadioProxy = IRadio.getService(HIDL_SERVICE_NAME[mPhoneId == null ? 0 : mPhoneId]);

            if (mRadioProxy != null) {

                mRadioProxy.linkToDeath(mRadioProxyDeathRecipient,

                        mRadioProxyCookie.incrementAndGet());
@@ -545,7 +544,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { 


        try {

            mOemHookProxy = IOemHook.getService(

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

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

            if (mOemHookProxy != null) {

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

                // notification for that should be sufficient