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

Commit f57e4c9b 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 f320c698 7da537a6

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -42501,6 +42501,7 @@ package android.telephony { 
    field public static final int CALL_STATE_IDLE = 0; // 0x0

    field public static final int CALL_STATE_OFFHOOK = 2; // 0x2

    field public static final int CALL_STATE_RINGING = 1; // 0x1

    field public static final String CAPABILITY_SLICING_CONFIG_SUPPORTED = "CAPABILITY_SLICING_CONFIG_SUPPORTED";

    field public static final int CDMA_ROAMING_MODE_AFFILIATED = 1; // 0x1

    field public static final int CDMA_ROAMING_MODE_ANY = 2; // 0x2

    field public static final int CDMA_ROAMING_MODE_HOME = 0; // 0x0

telephony/java/android/telephony/TelephonyManager.java

+14 −0
Original line number Diff line number Diff line
@@ -14951,6 +14951,13 @@ public class TelephonyManager { 
    public static final String CAPABILITY_THERMAL_MITIGATION_DATA_THROTTLING =

            "CAPABILITY_THERMAL_MITIGATION_DATA_THROTTLING";













    /**













     * Indicates whether {@link #getNetworkSlicingConfiguration} is supported. See comments on













     * respective methods for more information.













     */













    public static final String CAPABILITY_SLICING_CONFIG_SUPPORTED =













            "CAPABILITY_SLICING_CONFIG_SUPPORTED";



























    /** @hide */















    @Retention(RetentionPolicy.SOURCE)















    @StringDef(prefix = "CAPABILITY_", value = {









@@ -14958,6 +14965,7 @@ public class TelephonyManager {













            CAPABILITY_ALLOWED_NETWORK_TYPES_USED,















            CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE,















            CAPABILITY_THERMAL_MITIGATION_DATA_THROTTLING,













            CAPABILITY_SLICING_CONFIG_SUPPORTED,















    })















    public @interface RadioInterfaceCapability {}
























@@ -15609,9 +15617,15 @@ public class TelephonyManager {













     *     <li>If the calling app has carrier privileges (see {@link #hasCarrierPrivileges}).















     * </ul>















     *













     * This will be invalid if the device does not support













     * android.telephony.TelephonyManager#CAPABILITY_SLICING_CONFIG_SUPPORTED.













     *















     * @param executor the executor on which callback will be invoked.















     * @param callback a callback to receive the current slicing configuration.















     */













    @RequiresFeature(













            enforcement = "android.telephony.TelephonyManager#isRadioInterfaceCapabilitySupported",













            value = TelephonyManager.CAPABILITY_SLICING_CONFIG_SUPPORTED)















    @SuppressAutoDoc // No support for carrier privileges (b/72967236).















    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)















    public void getNetworkSlicingConfiguration(