Consider MMS as mutable cap
Previously, to accomodate wlan specifc APN, telephony dynamically add and remove MMS cap from the default network depending on QNS's preference.
However, since APN capabilities are considered immutable by connectivity, every dynamic change triggers an internet validation, which drains bettery power.
Terefore, in this change, telephony no longer recreate network agent, thus connectivity would no longer perform internet validation.
The consequence of this change is that connectivity won't perform network re-assign for the apps who already knows the old network, but it's fine because MMS requests are short-lived and only MMS service make such request.
Fix: 347018492
Test: daily check b/347018492#comment33
Test: send MMS w/ TMO using WLAN and cellular, reviewed log
Test: atest datanetworktest.java
Flag: NONE associated with a nextfood rolled out flag, time not allowed to rollout with another separate flag to deliver along with the original fix
Change-Id: I498d4195434d06c6c28f925ba76a1df6a6c218f4
diff --git a/src/java/com/android/internal/telephony/data/DataNetwork.java b/src/java/com/android/internal/telephony/data/DataNetwork.java
index 8369874..eaa0962 100644
--- a/src/java/com/android/internal/telephony/data/DataNetwork.java
+++ b/src/java/com/android/internal/telephony/data/DataNetwork.java
@@ -460,7 +460,10 @@
// Dynamically add and remove MMTEL capability when network transition between VoPS
// and non-VoPS network if the request is not MMTEL. For MMTEL, we retain the capability
// to prevent immediate tear down.
- NetworkCapabilities.NET_CAPABILITY_MMTEL
+ NetworkCapabilities.NET_CAPABILITY_MMTEL,
+ // Dynamically add and remove MMS capability depending on QNS's preference if there is
+ // a transport specific APN alternative.
+ NetworkCapabilities.NET_CAPABILITY_MMS
);
/** The parent state. Any messages not handled by the child state fallback to this. */
diff --git a/tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkTest.java b/tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkTest.java
index 7795e42..8be0f8b 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkTest.java
@@ -2421,6 +2421,10 @@
doReturn(true).when(mFeatureFlags).forceIwlanMms();
setupDataNetwork();
+ TelephonyNetworkAgent mockNetworkAgent = Mockito.mock(TelephonyNetworkAgent.class);
+ replaceInstance(DataNetwork.class, "mNetworkAgent",
+ mDataNetworkUT, mockNetworkAgent);
+
assertThat(mDataNetworkUT.getNetworkCapabilities()
.hasCapability(NetworkCapabilities.NET_CAPABILITY_MMS)).isTrue();
@@ -2465,11 +2469,13 @@
.onPreferredTransportChanged(NetworkCapabilities.NET_CAPABILITY_MMS, false);
processAllMessages();
- // Check if MMS capability is removed.
+ // Check if MMS capability is removed, and we don't recreat network agent which triggers
+ // powering comsuming internet validation.
assertThat(mDataNetworkUT.getNetworkCapabilities()
.hasCapability(NetworkCapabilities.NET_CAPABILITY_MMS)).isFalse();
+ verify(mockNetworkAgent, never()).abandon();
- // Now QNS prefers MMS on IWLAN
+ // Now QNS prefers MMS on WWAN
doReturn(AccessNetworkConstants.TRANSPORT_TYPE_WWAN).when(mAccessNetworksManager)
.getPreferredTransportByNetworkCapability(NetworkCapabilities.NET_CAPABILITY_MMS);
accessNetworksManagerCallbackArgumentCaptor.getValue()