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

Commit e5f2da31 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove CBS slice" am: 05ae6609 

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

Change-Id: I4bd4a1bdde6b1439471cef5e9d69447ef618efba
parents 4a89a800 05ae6609

src/java/com/android/internal/telephony/data/TelephonyNetworkRequest.java

+2 −2
Original line number Diff line number Diff line
@@ -109,9 +109,9 @@ public class TelephonyNetworkRequest { 
                    CAPABILITY_ATTRIBUTE_APN_SETTING | CAPABILITY_ATTRIBUTE_TRAFFIC_DESCRIPTOR_DNN),

            new SimpleImmutableEntry<>(NetworkCapabilities.NET_CAPABILITY_IMS,

                    CAPABILITY_ATTRIBUTE_APN_SETTING | CAPABILITY_ATTRIBUTE_TRAFFIC_DESCRIPTOR_DNN),

            // TODO add OS APP Id as part of b/206703524

            new SimpleImmutableEntry<>(NetworkCapabilities.NET_CAPABILITY_CBS,

                    CAPABILITY_ATTRIBUTE_APN_SETTING | CAPABILITY_ATTRIBUTE_TRAFFIC_DESCRIPTOR_DNN

                            | CAPABILITY_ATTRIBUTE_TRAFFIC_DESCRIPTOR_OS_APP_ID),

                    CAPABILITY_ATTRIBUTE_APN_SETTING | CAPABILITY_ATTRIBUTE_TRAFFIC_DESCRIPTOR_DNN),

            new SimpleImmutableEntry<>(NetworkCapabilities.NET_CAPABILITY_XCAP,

                    CAPABILITY_ATTRIBUTE_APN_SETTING | CAPABILITY_ATTRIBUTE_TRAFFIC_DESCRIPTOR_DNN),

            new SimpleImmutableEntry<>(NetworkCapabilities.NET_CAPABILITY_EIMS,

tests/telephonytests/src/com/android/internal/telephony/data/TelephonyNetworkRequestTest.java

+3 −2
Original line number Diff line number Diff line
@@ -311,7 +311,8 @@ public class TelephonyNetworkRequestTest extends TelephonyTest { 
                        .getBytes()))

                .build();



        assertThat(cbsRequest.canBeSatisfiedBy(cbsDataProfile)).isTrue();

        assertThat(embbRequest.canBeSatisfiedBy(cbsDataProfile)).isFalse();

        // TODO: fix as part of as part of b/206703524

        //assertThat(cbsRequest.canBeSatisfiedBy(cbsDataProfile)).isTrue();

        //assertThat(embbRequest.canBeSatisfiedBy(cbsDataProfile)).isFalse();

    }

}