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

Commit 404b4c76 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

Merge changes from topics "118348832", "120945564" am: c749220d 

am: f03296c4

Change-Id: I6e8508708fb82de773d457094fe0c85498154358
parents 1ff47f34 f03296c4

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

+2 −2
Original line number Diff line number Diff line
@@ -40,10 +40,10 @@ class PhoneConfigurationModels { 
        List<ModemInfo> logicalModemList = new ArrayList<>();

        logicalModemList.add(modemInfo1);

        logicalModemList.add(modemInfo2);

        DSDS_CAPABILITY = new PhoneCapability(1, 2, 0, logicalModemList);

        DSDS_CAPABILITY = new PhoneCapability(1, 2, 0, logicalModemList, false);



        logicalModemList = new ArrayList<>();

        logicalModemList.add(modemInfo1);

        SSSS_CAPABILITY = new PhoneCapability(1, 1, 0, logicalModemList);

        SSSS_CAPABILITY = new PhoneCapability(1, 1, 0, logicalModemList, false);

    }

}

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

+3 −1
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ public class RadioConfigResponse extends IRadioConfigResponse.Stub { 
        int maxActiveVoiceCalls = 0;

        int maxActiveData = phoneCapability.maxActiveData;

        int max5G = 0;

        boolean validationBeforeSwitchSupported = phoneCapability.isInternetLingeringSupported;

        List<ModemInfo> logicalModemList = new ArrayList();



        for (android.hardware.radio.config.V1_1.ModemInfo
@@ -128,7 +129,8 @@ public class RadioConfigResponse extends IRadioConfigResponse.Stub { 
            logicalModemList.add(new ModemInfo(modemInfo.modemId));

        }



        return new PhoneCapability(maxActiveVoiceCalls, maxActiveData, max5G, logicalModemList);

        return new PhoneCapability(maxActiveVoiceCalls, maxActiveData, max5G, logicalModemList,

                validationBeforeSwitchSupported);

    }

    /**

     * Response function for IRadioConfig.getPhoneCapability().

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

+4 −4
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ public class PhoneCapabilityTest { 
        logicalModemList.add(modemInfo);



        PhoneCapability capability = new PhoneCapability(maxActiveVoiceCalls, maxActiveData, max5G,

                logicalModemList);

                logicalModemList, false);



        assertEquals(maxActiveVoiceCalls, capability.maxActiveVoiceCalls);

        assertEquals(maxActiveData, capability.maxActiveData);
@@ -49,9 +49,9 @@ public class PhoneCapabilityTest { 
        assertEquals(1, capability.logicalModemList.size());

        assertEquals(modemInfo, capability.logicalModemList.get(0));

        PhoneCapability toCompare = new PhoneCapability(

                maxActiveVoiceCalls + 1, maxActiveData - 1, max5G, logicalModemList);

                maxActiveVoiceCalls + 1, maxActiveData - 1, max5G, logicalModemList, false);

        assertEquals(capability, new PhoneCapability(

                maxActiveVoiceCalls, maxActiveData, max5G, logicalModemList));

                maxActiveVoiceCalls, maxActiveData, max5G, logicalModemList, false));

        assertNotEquals(capability, toCompare);

    }
@@ -66,7 +66,7 @@ public class PhoneCapabilityTest { 
        logicalModemList.add(modemInfo);



        PhoneCapability capability = new PhoneCapability(maxActiveVoiceCalls, maxActiveData, max5G,

                logicalModemList);

                logicalModemList, false);



        Parcel parcel = Parcel.obtain();

        capability.writeToParcel(parcel, 0);

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

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ public class TelephonyRegistryTest extends TelephonyTest { 
    public void testPhoneCapabilityChanged() {

        // mTelephonyRegistry.listen with notifyNow = true should trigger callback immediately.

        setReady(false);

        PhoneCapability phoneCapability = new PhoneCapability(1, 2, 3, null);

        PhoneCapability phoneCapability = new PhoneCapability(1, 2, 3, null, false);

        mTelephonyRegistry.notifyPhoneCapabilityChanged(phoneCapability);

        mTelephonyRegistry.listen(mContext.getOpPackageName(),

                mPhoneStateListener.callback,
@@ -113,7 +113,7 @@ public class TelephonyRegistryTest extends TelephonyTest { 


        // notifyPhoneCapabilityChanged with a new capability. Callback should be triggered.

        setReady(false);

        phoneCapability = new PhoneCapability(3, 2, 2, null);

        phoneCapability = new PhoneCapability(3, 2, 2, null, false);

        mTelephonyRegistry.notifyPhoneCapabilityChanged(phoneCapability);

        waitUntilReady();

        assertEquals(phoneCapability, mPhoneCapability);