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

Commit 903a6a14 authored by Jack Nudelman's avatar Jack Nudelman Committed by Automerger Merge Worker
Browse files

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

Merge "Add thermal mitigation capability to feature set at HAL level." am: cb2e8122 am: 87d20d79 am: ac2b9cf6

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

Change-Id: Ide2a28a24c367afc3e797e34de232bb7158d8162
parents 12340836 ac2b9cf6

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;
@@ -306,6 +307,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));

    }

}