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

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

Merge "Fixed WFC activation issue" am: d91e0df9 

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



Change-Id: I80f95a48c2440faddeb06c71d1e4378e4ddf517c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8e9325a5 d91e0df9

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

+1 −1
Original line number Diff line number Diff line
@@ -1729,7 +1729,7 @@ public class DataNetwork extends StateMachine { 


        TrafficDescriptor trafficDescriptor = mDataProfile.getTrafficDescriptor();

        final boolean matchAllRuleAllowed = trafficDescriptor == null

                || trafficDescriptor.getOsAppId() == null;

                || !TextUtils.isEmpty(trafficDescriptor.getDataNetworkName());



        int accessNetwork = DataUtils.networkTypeToAccessNetworkType(dataNetworkType);

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_APN_SETTING | CAPABILITY_ATTRIBUTE_TRAFFIC_DESCRIPTOR_DNN

                            | CAPABILITY_ATTRIBUTE_TRAFFIC_DESCRIPTOR_OS_APP_ID),

            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/DataNetworkTest.java

+39 −3
Original line number Diff line number Diff line
@@ -134,6 +134,24 @@ public class DataNetworkTest extends TelephonyTest { 
            .setTrafficDescriptor(new TrafficDescriptor("fake_apn", null))

            .build();



    private final DataProfile mEnterpriseDataProfile = new DataProfile.Builder()

            .setTrafficDescriptor(new TrafficDescriptor(null,

                    new TrafficDescriptor.OsAppId(TrafficDescriptor.OsAppId.ANDROID_OS_ID,

                            "ENTERPRISE", 1).getBytes()))

            .build();



    private final DataProfile mUrlccDataProfile = new DataProfile.Builder()

            .setTrafficDescriptor(new TrafficDescriptor(null,

                    new TrafficDescriptor.OsAppId(TrafficDescriptor.OsAppId.ANDROID_OS_ID,

                            "PRIORITIZE_LATENCY", 1).getBytes()))

            .build();



    private final DataProfile mEmbbDataProfile = new DataProfile.Builder()

            .setTrafficDescriptor(new TrafficDescriptor(null,

                    new TrafficDescriptor.OsAppId(TrafficDescriptor.OsAppId.ANDROID_OS_ID,

                            "PRIORITIZE_BANDWIDTH", 1).getBytes()))

            .build();



    // Mocked classes

    private DataNetworkCallback mDataNetworkCallback;

    private DataCallSessionStats mDataCallSessionStats;
@@ -338,7 +356,7 @@ public class DataNetworkTest extends TelephonyTest { 
        setSuccessfulSetupDataResponse(mMockedWwanDataServiceManager, 123, tds);



        mDataNetworkUT = new DataNetwork(mPhone, Looper.myLooper(), mDataServiceManagers,

                mInternetDataProfile, networkRequestList,

                mEnterpriseDataProfile, networkRequestList,

                AccessNetworkConstants.TRANSPORT_TYPE_WWAN, DataAllowedReason.NORMAL,

                mDataNetworkCallback);

        replaceInstance(DataNetwork.class, "mDataCallSessionStats",
@@ -348,6 +366,12 @@ public class DataNetworkTest extends TelephonyTest { 


        processAllMessages();



        verify(mMockedWwanDataServiceManager).setupDataCall(eq(AccessNetworkType.EUTRAN),

                eq(mEnterpriseDataProfile), eq(false), eq(false),

                eq(DataService.REQUEST_REASON_NORMAL), nullable(LinkProperties.class),

                eq(DataCallResponse.PDU_SESSION_ID_NOT_SET), nullable(NetworkSliceInfo.class),

                any(TrafficDescriptor.class), eq(false), any(Message.class));



        NetworkCapabilities nc = mDataNetworkUT.getNetworkCapabilities();

        assertThat(nc.hasCapability(NetworkCapabilities.NET_CAPABILITY_ENTERPRISE)).isTrue();

        assertThat(nc.getEnterpriseIds()).asList().containsExactly(1, 5);
@@ -369,7 +393,7 @@ public class DataNetworkTest extends TelephonyTest { 
        setSuccessfulSetupDataResponse(mMockedWwanDataServiceManager, 123, tds);



        mDataNetworkUT = new DataNetwork(mPhone, Looper.myLooper(), mDataServiceManagers,

                mInternetDataProfile, networkRequestList,

                mUrlccDataProfile, networkRequestList,

                AccessNetworkConstants.TRANSPORT_TYPE_WWAN, DataAllowedReason.NORMAL,

                mDataNetworkCallback);

        replaceInstance(DataNetwork.class, "mDataCallSessionStats",
@@ -379,6 +403,12 @@ public class DataNetworkTest extends TelephonyTest { 


        processAllMessages();



        verify(mMockedWwanDataServiceManager).setupDataCall(eq(AccessNetworkType.EUTRAN),

                eq(mUrlccDataProfile), eq(false), eq(false),

                eq(DataService.REQUEST_REASON_NORMAL), nullable(LinkProperties.class),

                eq(DataCallResponse.PDU_SESSION_ID_NOT_SET), nullable(NetworkSliceInfo.class),

                any(TrafficDescriptor.class), eq(false), any(Message.class));



        NetworkCapabilities nc = mDataNetworkUT.getNetworkCapabilities();

        assertThat(nc.hasCapability(NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_LATENCY))

                .isTrue();
@@ -400,7 +430,7 @@ public class DataNetworkTest extends TelephonyTest { 
        setSuccessfulSetupDataResponse(mMockedWwanDataServiceManager, 123, tds);



        mDataNetworkUT = new DataNetwork(mPhone, Looper.myLooper(), mDataServiceManagers,

                mInternetDataProfile, networkRequestList,

                mEmbbDataProfile, networkRequestList,

                AccessNetworkConstants.TRANSPORT_TYPE_WWAN, DataAllowedReason.NORMAL,

                mDataNetworkCallback);

        replaceInstance(DataNetwork.class, "mDataCallSessionStats",
@@ -410,6 +440,12 @@ public class DataNetworkTest extends TelephonyTest { 


        processAllMessages();



        verify(mMockedWwanDataServiceManager).setupDataCall(eq(AccessNetworkType.EUTRAN),

                eq(mEmbbDataProfile), eq(false), eq(false),

                eq(DataService.REQUEST_REASON_NORMAL), nullable(LinkProperties.class),

                eq(DataCallResponse.PDU_SESSION_ID_NOT_SET), nullable(NetworkSliceInfo.class),

                any(TrafficDescriptor.class), eq(false), any(Message.class));



        NetworkCapabilities nc = mDataNetworkUT.getNetworkCapabilities();

        assertThat(nc.hasCapability(NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_BANDWIDTH))

                .isTrue();

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

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

                .build();



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

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

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

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

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

    }

}