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

Commit 43ac867d authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Use new NetworkCapability API am: 4ba10694 

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

Change-Id: I17ef4b56e158437c45a6e78bc77a5c78f1f06a9f
parents daed7d6e 4ba10694

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+4 −4
Original line number Diff line number Diff line
@@ -882,8 +882,8 @@ public class DataConnection extends StateMachine { 
        String dnn = null;

        String osAppId = null;

        if (cp.mApnContext.getApnTypeBitmask() == ApnSetting.TYPE_ENTERPRISE) {

            // TODO(b/181916712): update osAppId to use NetworkCapability API once it's available

            osAppId = ApnSetting.getApnTypesStringFromBitmask(mApnSetting.getApnTypeBitmask());

            osAppId = NetworkCapabilities.getCapabilityCarrierName(

                    NetworkCapabilities.NET_CAPABILITY_ENTERPRISE);

        } else {

            dnn = mApnSetting.getApnName();

        }
@@ -1723,11 +1723,11 @@ public class DataConnection extends StateMachine { 
     * @return True if this data connection supports enterprise use.

     */

    private boolean isEnterpriseUse() {

        // TODO(b/181916712): update osAppId to use NetworkCapability API once it's available

        boolean enterpriseTrafficDescriptor = mTrafficDescriptors

                .stream()

                .anyMatch(td -> td.getOsAppId() != null && td.getOsAppId().equals(

                        ApnSetting.TYPE_ENTERPRISE_STRING));

                        NetworkCapabilities.getCapabilityCarrierName(

                                NetworkCapabilities.NET_CAPABILITY_ENTERPRISE)));

        boolean enterpriseApnContext = mApnContexts.keySet()

                .stream()

                .anyMatch(ac -> ac.getApnTypeBitmask() == ApnSetting.TYPE_ENTERPRISE);

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -1219,7 +1219,7 @@ public class DcTrackerTest extends TelephonyTest { 
                eq(DataService.REQUEST_REASON_NORMAL), any(), anyInt(), any(), tdCaptor.capture(),

                anyBoolean(), any(Message.class));

        assertEquals(null, tdCaptor.getValue().getDnn());

        assertTrue(tdCaptor.getValue().getOsAppId().contains(ApnSetting.TYPE_ENTERPRISE_STRING));

        assertTrue(tdCaptor.getValue().getOsAppId().equals("ENTERPRISE"));

    }



    @Test