Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
Change-Id: I81811e8c0e9da73d03614cad7a4e7e6340c06803
diff --git a/Android.mk b/Android.mk
index 6b9b37b..b99c6b3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,8 +23,7 @@
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_PRIVILEGED_MODULE := true
-LOCAL_JAVA_LIBRARIES := telephony-common okhttp
-LOCAL_STATIC_JAVA_LIBRARIES := services.net
+LOCAL_JAVA_LIBRARIES := telephony-common
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 40e03cd..1e77134 100644
--- a/src/com/android/mms/service/MmsHttpClient.java
+++ b/src/com/android/mms/service/MmsHttpClient.java
@@ -20,7 +20,6 @@
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;
@@ -93,7 +92,7 @@
mContext = context;
// Mms server is on a carrier private network so it may not be resolvable using 3rd party
// private dns
- mNetwork = ResolvUtil.makeNetworkWithPrivateDnsBypass(network);
+ mNetwork = network.getPrivateDnsBypassingCopy();
mConnectivityManager = connectivityManager;
}
