Bypass private DNS for Mmsandroid-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-dev

Bug: b/78601698
Bug: b/78494660
Test: manual: MMS sending works
Change-Id: I1e3e0ba21d17108cf9c898e28137010492dc306b

2 files changed, 5 insertions, 1 deletions

diff --git a/Android.mk b/Android.mk
index 87a19a8..6b9b37b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,6 +24,7 @@ LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_PRIVILEGED_MODULE := true
 
 LOCAL_JAVA_LIBRARIES := telephony-common okhttp
+LOCAL_STATIC_JAVA_LIBRARIES := services.net
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/src/com/android/mms/service/MmsHttpClient.java b/src/com/android/mms/service/MmsHttpClient.java
index 8d6a0d0..40e03cd 100644
--- a/src/com/android/mms/service/MmsHttpClient.java
+++ b/src/com/android/mms/service/MmsHttpClient.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.LinkProperties;
 import android.net.Network;
+import android.net.dns.ResolvUtil;
 import android.os.Bundle;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SmsManager;
@@ -90,7 +91,9 @@ public class MmsHttpClient {
     public MmsHttpClient(Context context, Network network,
             ConnectivityManager connectivityManager) {
         mContext = context;
-        mNetwork = network;
+        // Mms server is on a carrier private network so it may not be resolvable using 3rd party
+        // private dns
+        mNetwork = ResolvUtil.makeNetworkWithPrivateDnsBypass(network);
         mConnectivityManager = connectivityManager;
     }