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

Commit 65d99964 authored by Amit Mahajan's avatar Amit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "add capability for TelephonyManager.getNetworkSlicingConfiguration()" into sc-dev

parents 2551aaed 8a381250

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_SLICING_CONFIG_SUPPORTED;

import static android.telephony.TelephonyManager.CAPABILITY_THERMAL_MITIGATION_DATA_THROTTLING;

import static android.telephony.TelephonyManager.RadioInterfaceCapability;
@@ -309,6 +310,8 @@ public class RadioConfigResponse extends IRadioConfigResponse.Stub { 
                Rlog.d(TAG, "CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE");

                caps.add(CAPABILITY_THERMAL_MITIGATION_DATA_THROTTLING);

                Rlog.d(TAG, "CAPABILITY_THERMAL_MITIGATION_DATA_THROTTLING");

                caps.add(CAPABILITY_SLICING_CONFIG_SUPPORTED);

                Rlog.d(TAG, "CAPABILITY_SLICING_CONFIG_SUPPORTED");

            }

        }

        return caps;

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

+6 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ public class RadioConfigResponseTest extends TelephonyTest { 
                        TelephonyManager.CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE));

        assertFalse(

                caps.contains(TelephonyManager.CAPABILITY_THERMAL_MITIGATION_DATA_THROTTLING));

        assertFalse(

                caps.contains(TelephonyManager.CAPABILITY_SLICING_CONFIG_SUPPORTED));

    }



    @Test
@@ -68,6 +70,8 @@ public class RadioConfigResponseTest extends TelephonyTest { 
                        TelephonyManager.CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE));

        assertFalse(

                caps.contains(TelephonyManager.CAPABILITY_THERMAL_MITIGATION_DATA_THROTTLING));

        assertFalse(

                caps.contains(TelephonyManager.CAPABILITY_SLICING_CONFIG_SUPPORTED));

    }



    @Test
@@ -82,5 +86,7 @@ public class RadioConfigResponseTest extends TelephonyTest { 
                        TelephonyManager.CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE));

        assertTrue(

                caps.contains(TelephonyManager.CAPABILITY_THERMAL_MITIGATION_DATA_THROTTLING));

        assertTrue(

                caps.contains(TelephonyManager.CAPABILITY_SLICING_CONFIG_SUPPORTED));

    }

}