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

Commit 95e73eca authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Automerger Merge Worker
Browse files

Merge "Allow REQUEST_NOT_SUPPORTED for nr dual connectivity config" am: 88ec49e4 am: c450f570 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4350ed3dced8187ada0bb3279797c9b68d544a07
parents 4e03056d c450f570

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

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
package com.android.internal.telephony;



import static android.telephony.TelephonyManager.CAPABILITY_ALLOWED_NETWORK_TYPES_USED;

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.RadioInterfaceCapability;
@@ -303,6 +305,8 @@ public class RadioConfigResponse extends IRadioConfigResponse.Stub { 
            if (!modemReducedFeatureSet1) {

                caps.add(CAPABILITY_SECONDARY_LINK_BANDWIDTH_VISIBLE);

                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");

            }

        }

        return caps;

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

+9 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ public class RadioConfigResponseTest extends TelephonyTest { 
                caps.contains(TelephonyManager.CAPABILITY_SECONDARY_LINK_BANDWIDTH_VISIBLE));

        assertFalse(

                caps.contains(TelephonyManager.CAPABILITY_ALLOWED_NETWORK_TYPES_USED));

        assertFalse(

                caps.contains(

                        TelephonyManager.CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE));

    }



    @Test
@@ -58,6 +61,9 @@ public class RadioConfigResponseTest extends TelephonyTest { 
                caps.contains(TelephonyManager.CAPABILITY_SECONDARY_LINK_BANDWIDTH_VISIBLE));

        assertTrue(

                caps.contains(TelephonyManager.CAPABILITY_ALLOWED_NETWORK_TYPES_USED));

        assertFalse(

                caps.contains(

                        TelephonyManager.CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE));

    }



    @Test
@@ -67,5 +73,8 @@ public class RadioConfigResponseTest extends TelephonyTest { 
                caps.contains(TelephonyManager.CAPABILITY_SECONDARY_LINK_BANDWIDTH_VISIBLE));

        assertTrue(

                caps.contains(TelephonyManager.CAPABILITY_ALLOWED_NETWORK_TYPES_USED));

        assertTrue(

                caps.contains(

                        TelephonyManager.CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE));

    }

}