commit 920797b2c09e6bd9283f7ab1d9dedb05730b737f
author android-build-team Robot <android-build-team-robot@google.com> Wed May 02 07:24:09 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed May 02 07:24:09 2018 +0000
tree ef18a62dbfb1f92ff578b8feadb15299b1ed465a
parent b3719eb3bbb71800e0c799793ecc9628eee7aaa4
parent 2a83a312bd4a0b1996a40351beb61f0620d7d9d1

Snap for 4756844 from 2a83a312bd4a0b1996a40351beb61f0620d7d9d1 to pi-release

Change-Id: Ia2e68d8d5376fc011ace946b3dc222fc47de186e

Android.mk

diff --git a/Android.mk b/Android.mk
index 87a19a8..6b9b37b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,6 +24,7 @@
 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)
 

src/com/android/mms/service/MmsHttpClient.java

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.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 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;
     }