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

Commit 7d272d6c authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Fixed the broken tests am: edbd1c40 am: 24e0362d 

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



Change-Id: I6a805fccefc2fdd7c40d435836906848b09ec46b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 81695df6 24e0362d

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

+2 −0
Original line number Diff line number Diff line
@@ -1873,6 +1873,8 @@ public class DataNetwork extends StateMachine { 
            removeUnsatisfiedNetworkRequests();

            mDataNetworkCallback.invokeFromExecutor(() -> mDataNetworkCallback

                    .onNetworkCapabilitiesChanged(DataNetwork.this));

        } else {

            log("updateNetworkCapabilities: Capabilities not changed.");

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -1143,7 +1143,7 @@ public class DataNetworkTest extends TelephonyTest { 
        assertThat(mDataNetworkUT.getNetworkCapabilities().hasCapability(

                NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED)).isFalse();



        doReturn(Set.of(TelephonyManager.NETWORK_TYPE_LTE)).when(mDataNetworkController)

        doReturn(Set.of(TelephonyManager.NETWORK_TYPE_UMTS)).when(mDataNetworkController)

                .getUnmeteredOverrideNetworkTypes();

        mDataNetworkUT.sendMessage(1/*EVENT_DATA_CONFIG_UPDATED*/);