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

Commit cb2e8122 authored by Jack Nudelman's avatar Jack Nudelman Committed by Gerrit Code Review
Browse files

Merge "Add thermal mitigation capability to feature set at HAL level."

parents c68a450e cd18fc16

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

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.telephony.TelephonyManager.CAPABILITY_ALLOWED_NETWORK_TYPE 
import static android.telephony.TelephonyManager

        .CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE;

import static android.telephony.TelephonyManager.CAPABILITY_SECONDARY_LINK_BANDWIDTH_VISIBLE;

import static android.telephony.TelephonyManager.CAPABILITY_THERMAL_MITIGATION_DATA_THROTTLING;

import static android.telephony.TelephonyManager.RadioInterfaceCapability;



import android.hardware.radio.V1_0.RadioError;
@@ -307,6 +308,8 @@ public class RadioConfigResponse extends IRadioConfigResponse.Stub { 
                Rlog.d(TAG, "CAPABILITY_SECONDARY_LINK_BANDWIDTH_VISIBLE");

                caps.add(CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE);

                Rlog.d(TAG, "CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE");

                caps.add(CAPABILITY_THERMAL_MITIGATION_DATA_THROTTLING);

                Rlog.d(TAG, "CAPABILITY_THERMAL_MITIGATION_DATA_THROTTLING");

            }

        }

        return caps;

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

+6 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ public class RadioConfigResponseTest extends TelephonyTest { 
        assertFalse(

                caps.contains(

                        TelephonyManager.CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE));

        assertFalse(

                caps.contains(TelephonyManager.CAPABILITY_THERMAL_MITIGATION_DATA_THROTTLING));

    }



    @Test
@@ -64,6 +66,8 @@ public class RadioConfigResponseTest extends TelephonyTest { 
        assertFalse(

                caps.contains(

                        TelephonyManager.CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE));

        assertFalse(

                caps.contains(TelephonyManager.CAPABILITY_THERMAL_MITIGATION_DATA_THROTTLING));

    }



    @Test
@@ -76,5 +80,7 @@ public class RadioConfigResponseTest extends TelephonyTest { 
        assertTrue(

                caps.contains(

                        TelephonyManager.CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE));

        assertTrue(

                caps.contains(TelephonyManager.CAPABILITY_THERMAL_MITIGATION_DATA_THROTTLING));

    }

}