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

Commit d8754a48 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "atel_radioerror" am: db266b7a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1478616

Change-Id: Ifa9f71f6b232ecbebf084fd85d20aabbb706480d
parents 8162e582 db266b7a

tests/telephonytests/src/com/android/internal/telephony/RILTest.java

+52 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ import android.hardware.radio.V1_0.RadioResponseInfo; 
import android.hardware.radio.V1_0.RadioResponseType;

import android.hardware.radio.V1_0.RadioTechnologyFamily;

import android.hardware.radio.V1_0.SmsWriteArgs;

import android.hardware.radio.V1_5.IRadio;

import android.hardware.radio.V1_6.IRadio;

import android.hardware.radio.deprecated.V1_0.IOemHook;

import android.net.ConnectivityManager;

import android.net.InetAddresses;
@@ -201,6 +201,7 @@ public class RILTest extends TelephonyTest { 
    private HalVersion mRadioVersionV13 = new HalVersion(1, 3);

    private HalVersion mRadioVersionV14 = new HalVersion(1, 4);

    private HalVersion mRadioVersionV15 = new HalVersion(1, 5);

    private HalVersion mRadioVersionV16 = new HalVersion(1, 6);



    private RIL mRILInstance;

    private RIL mRILUnderTest;
@@ -706,6 +707,29 @@ public class RILTest extends TelephonyTest { 
        verifyRILResponse(mRILUnderTest, mSerialNumberCaptor.getValue(), RIL_REQUEST_RADIO_POWER);

    }



    @FlakyTest

    @Test

    public void testSetRadioPower_1_6() throws Exception {

        boolean on = true, forEmergencyCall = false, preferredForEmergencyCall = false;



        // Use Radio HAL v1.6

        try {

            replaceInstance(RIL.class, "mRadioVersion", mRILUnderTest, mRadioVersionV16);

        } catch (Exception e) {

        }



        mRILUnderTest.setRadioPower(

                on, forEmergencyCall, preferredForEmergencyCall, obtainMessage());

        verify(mRadioProxy)

                .setRadioPower_1_6(

                        mSerialNumberCaptor.capture(),

                        eq(on),

                        eq(forEmergencyCall),

                        eq(preferredForEmergencyCall));

        verifyRILResponse_1_6(

                mRILUnderTest, mSerialNumberCaptor.getValue(), RIL_REQUEST_RADIO_POWER);

    }



    @FlakyTest

    @Test

    public void testSendDtmf() throws Exception {
@@ -1278,6 +1302,23 @@ public class RILTest extends TelephonyTest { 
        assertFalse(ril.getWakeLock(RIL.FOR_WAKELOCK).isHeld());

    }



    private static void verifyRILResponse_1_6(RIL ril, int serial, int requestType) {

        android.hardware.radio.V1_6.RadioResponseInfo responseInfo =

                createFakeRadioResponseInfo_1_6(

                        serial, RadioError.NONE, RadioResponseType.SOLICITED);



        RILRequest rr = ril.processResponse_1_6(responseInfo);

        assertNotNull(rr);



        assertEquals(serial, rr.getSerial());

        assertEquals(requestType, rr.getRequest());

        assertTrue(ril.getWakeLock(RIL.FOR_WAKELOCK).isHeld());



        ril.processResponseDone_1_6(rr, responseInfo, null);

        assertEquals(0, ril.getRilRequestList().size());

        assertFalse(ril.getWakeLock(RIL.FOR_WAKELOCK).isHeld());

    }



    private static void verifyRILErrorResponse(RIL ril, int serial, int requestType, int error) {

        RadioResponseInfo responseInfo =

                createFakeRadioResponseInfo(serial, error, RadioResponseType.SOLICITED);
@@ -1323,6 +1364,16 @@ public class RILTest extends TelephonyTest { 
        return respInfo;

    }



    private static android.hardware.radio.V1_6.RadioResponseInfo createFakeRadioResponseInfo_1_6(

            int serial, int error, int type) {

        android.hardware.radio.V1_6.RadioResponseInfo respInfo =

                new android.hardware.radio.V1_6.RadioResponseInfo();

        respInfo.serial = serial;

        respInfo.error = error;

        respInfo.type = type;

        return respInfo;

    }



    @Test

    public void testConvertHalCellInfoListForLTE() {

        android.hardware.radio.V1_0.CellInfoLte lte = new android.hardware.radio.V1_0.CellInfoLte();